Navbar
Merge branch 'master' of https://github.com/skogie/webtekprosjekt

Conflicts:
	nav.html