make changes
Merge branch 'master' of https://github.com/jMCHammer/TradingCardGame