Merge pull request #3 from mtabor150/master

changed class names
Merge pull request #4 from mtabor150/master

fixing database stuff
modified the battle mechanics to have a better feel
Merge pull request #5 from mtabor150/master

update database
created an activity for PJ to do his database testing
added some BS
Merge pull request #32 from pmarti28/master

Updated battle interface