Adding in some final touches for Alpha deadline
Merge branch 'master' of https://github.com/jMCHammer/TradingCardGame