Add parameters to calculateBid method for current amount of money
Merge branch 'master' of https://github.com/pct-app/Bidding-Game