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