2 commits

Author	SHA1	Message	Date
Claudio Maggioni	bca57e2a9b	Fixed and beautified merge	2020-03-23 21:30:20 +01:00
Nicola Brunner	953b1a609a	navbar is starting to work	2020-03-13 15:21:33 +01:00