nearly there on image bug fix
bug fixed for display of cheerups
merge master fixes into aws
deleting the raise from the form
styling changes to user profile, cheerups display
border radius frame cheeruper home page
Merge branch 'master' into aws

Conflicts:
	app/views/cheerups/_form.html.haml
stylesheet_link_tags removed because are in the asset pipeline
require tree in application.js