first bunch
asdf
2nd

bids problem - amount = nil
fixes
Merge remote-tracking branch 'origin/rspec' into develop

Conflicts:
	app/models/ability.rb
	app/models/bid.rb