styling changes to landing
Merge branch 'master' into landing_styling

Conflicts:
	app/assets/.DS_Store
	app/assets/stylesheets/application.css
	app/views/layouts/application.html.erb