update navbar
Merge branch 'master' of https://github.com/ClearEyesFullHearts/norisNode

Conflicts:
	public1/partials/modals/modalContact.html