took out nav
added navs back and a change
Merge remote-tracking branch 'origin/Nav-change'

Conflicts:
	index.php