Menu Changes in CSS and DOM
Merge branch 'ndynan'

Conflicts:
	js/main.js