Overhauled the navigation bar
Merge branch 'master' of https://github.com/ckubacak/piLab

Conflicts:
	css/main.css
	templates/navbar.tpl