cocaine added
added paperclip, a picture and fields in views
Merge branch 'master' of https://github.com/Timmay24/BW2

Conflicts:
	compshop/db/schema.rb