nearly finished the nav bar
Merge branch 'master' of https://github.com/wchamilton/phila

Conflicts:
	css/style.css
	index.html