nav
style menu items
Merge branch 'alotofshit'

Conflicts:
	index.html
her