Updated css
test
Merge branch 'master' of heroku.com:vast-cove-7446

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