Merge pull request #1 from mtabor150/master

modified .gitignore
modified battleMechanics to end a battle properly. also, added a 'battleMessage' to the battle interface.
Merge pull request #2 from pmarti28/feature_EndGameConditions

modified battleMechanics to end a battle properly. also, added a 'battle...
Merge pull request #27 from pmarti28/master

Phil unreasonably likes napolean dynamite
fixing conflicts
merging
merged database with battleactivity.java
Merge pull request #29 from PJDesi/database

Database