various style changes
Merge branch 'master' of github.com:numnums/sleepy-retreat-7565

Conflicts:
	app/views/layouts/_navigation.html.erb
	app/views/layouts/_navigation_links.html.erb
adding mobile nav back