Merge branch 'master' of https://github.com/klindenbach/301project
Merge pull request #202 from jcadek/master

Fixing Broken Menus (Resolved #201-5 and #201-6)
Merge pull request #203 from jcadek/master

Resolved 201-4 and fixed major bug in edit mode
Merge pull request #204 from jcadek/master

Fixed 201-2
Merge pull request #205 from jcadek/master

Fixed 201-1
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
Merge pull request #207 from jcadek/master

Resolved 201-3
Added a couple more TextViews