working on the bid page
Merge branch 'master' of https://github.com/ldikeou/project_odds_are

Conflicts:
	app/views/bids/new.html.erb

:wq#
paperclip installed