removing carrierwave bits again
Merge pull request #25 from Jamanius/upload_images

removing carrierwave bits again
Merge branch 'master' of https://github.com/Jamanius/GIFTe into seed_db

Conflicts:
	app/views/gifts/index.html.erb