bit of style
-Merge branch 'development' of github.com:AdamGoodApp/cheerup into development

Conflicts:
	app/assets/stylesheets/main.css
	app/views/main_pages/home.html.erb