Merge pull request #27 from pmarti28/master

Phil unreasonably likes napolean dynamite
Took me long enough to push the database structure, but here it is.
Added functionality in MainActivity.java to test the database and its functions.
fixing conflicts
merging
merged database with battleactivity.java
Merge pull request #29 from PJDesi/database

Database
Merge pull request #3 from mtabor150/master

changed class names