update main navi
Merge branch 'master' of https://github.com/igo903/Chaos_htmls

Conflicts:
	css/main.css