creates uploader and migration file for user model
creates migration for cheerup model
adds attr_accessible for cheerup image to cheerup model
updates uploader to include Rmagick
adds file upload field to cheerup
adds image to cheerup index view
adds image to show cheerup view
makes image conditional in individual cheerup view
shows images in cheerup index only if present
fixes user index to only show profile photos if present
Merge branch 'master' into kate

Conflicts:
	app/models/cheerup.rb
	db/schema.rb