added model uml
added test scenarios and algorithm description of auto-biding
Merge pull request #2 from New-York-Falcons/model

Model
possible collisions in auto bidding
Merge branch 'master' into model
Update auto-bidding-tests.txt

conflict resolution
Merge branch 'model' of https://github.com/New-York-Falcons/car-trading
added bid migration and model
* added validations to model
* corrected field naming in auction to snail_case
added create and update to bid controller
* fixed wrong named var in auctions controller
Merge branch 'master' into make-a-bid
Merge branch 'bids' into make-a-bid

Conflicts:
	app/models/auction.rb
	config/routes.rb
	db/schema.rb
Removed unused and dublicated migration

If you have a problem with the migration, rollback and do it again
Merge pull request #5 from New-York-Falcons/make-a-bid

Make a bid
migrated => updated schema
Merge branch 'master' of https://github.com/New-York-Falcons/car-trading into win

Conflicts:
	db/schema.rb