Merge branch 'Matt-Branch-4'

Cards added from shop to inventory
Cards remove from inventory when used
Exit button added to battleScreen
BattleScreen refresh works