deletes deviseorig file and adds schema to git ignore
adds carrierwave gem
creates profile picture uploader and adds profile picture string to users
adds uploader and attr_accessible to user moder
adds upload file field to user form
adds image to user view and adds rmagick gem
adds rmagick to uploader
user index displays uploaded profile pic
Merge branch 'master' into kate

Conflicts:
	db/schema.rb
modifying schema