changed header and navbar
Merge branch 'master' of https://github.com/cms2882/cappp

Conflicts:
	css/main.css