Tokens are accounted for in all removeGoods calls
Game Can be won, log works, merchant cards can only be purchased in placement phase
Merge pull request #16 from ethansr/even_better_trading

Even better trading