what is going on
Merge branch 'master' of https://github.com/jMCHammer/TradingCardGame
merging
Merge branch 'master' of https://github.com/jMCHammer/TradingCardGame
update for the change