update menu styles
Merge branch 'master' of github.com:willmcvay/SenseCamp

Conflicts:
	app/assets/stylesheets/main.css