nav
Merge branch 'master' of github.com:drufloe/OnePage

Conflicts:
	css/main.css
	index.php