Navbar
Merge branch 'master' of https://github.com/turos/hitme

Conflicts:
	index.html
	js/user.js