Add styling, show/hide functionality to Services.
Merge branch 'master' into services

Conflicts:
	app/assets/stylesheets/application.css.scss