edit and deleting cheerups if authorized
rating, like and flag buttons added to views
linking to cheeruper's profile on cheerup index
rating, Feedbacks controller
rating, like and flag functionality
fixing devise update profile bug
user profile pic with carrierwave
rating, styling buttons
merge conflict resolution
rating, fix the like button
rating, bugfix, only one rating going into database
master merged with tweet
bugfix don't allow to tweet other users cheerups
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
bugfix after authorization merge, show cheerup missing end tag, and image size in _cheerup partial