Added Paperclip
Added image field to auction
Added upload and view logic
Merge branch 'master' into image

Conflicts:
	Gemfile.lock
	app/controllers/auctions_controller.rb
	app/models/auction.rb
	app/views/auctions/new.html.haml
Fixed Gemfile.lock
Fixe Layouting stuff
Merge branch 'master' into image

Conflicts:
	Gemfile
	app/views/auctions/show.html.haml
Fixed some view bugs
Merge pull request #10 from New-York-Falcons/image

Image