Fixing edit collection screen
Merge branch 'master' of https://github.com/jMCHammer/TradingCardGame
battle stuff
merge conflicts
Merge branch 'master' of https://github.com/jMCHammer/TradingCardGame