Styling changes, mostly to the navbar
Merge branch 'master' of github.com:michellelfloyd/evac-front

Conflicts:
	app/index.html
Merge branch 'master' of github.com:michellelfloyd/evac-front