Merge branch 'master' of https://github.com/klindenbach/301project
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into 200-CombatMenus
#200 put TextViews back into combat menus
Merge pull request #206 from klindenbach/200-CombatMenus

200 combat menus