refactor css
Merge branch 'master' of github.com:dmi3000/meanies

Conflicts:
	app/assets/stylesheets/custom.css.scss
	app/views/layouts/application.html.erb
	app/views/static_pages/about.html.erb