Messed up Nav
Merge branch 'master' of https://github.com/acsands13/PilotPhilly

Conflicts:
	.DS_Store