Include all types and values in card generation
Buying a merchant card ends a tunr
public cards will update their status with controller when being bought
Merge pull request #18 from ethansr/even_better_trading

Fixes from playtest