edit and deleting cheerups if authorized
linking to cheeruper's profile on cheerup index
fixing devise update profile bug
user profile pic with carrierwave
merge conflict resolution
ignoring public/uploads directory
removing role from attr_accessible on user model
adding image_file field to cheerup model
removing duplicate edit button from cheerup show view
altering cheerup to allow either an image_url or an image_file upload
Merge branch 'master' into authorisation

Conflicts:
	app/models/cheerup.rb
	app/models/user.rb
	app/views/cheerups/_cheerup.html.erb
	app/views/cheerups/show.html.erb
	db/schema.rb