nav bar edits so far
nav bar, basic page wrap style done
Merge branch 'master' of https://github.com/fuag15/jason-site-quick

Conflicts:
	.DS_Store
	app/views/layouts/_navigation.html.haml
please excuse the mess