navbar etc
Merge branch 'master' of github.com:corn-x/web

Conflicts:
	public/templates/login.html