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
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
Commenting out the database calls in main because they crash the app.
Merge pull request #30 from mtabor150/debug

Commenting out the database calls in main because they crash the app.
Debugging Database
Merge branch 'master' into database

Conflicts:
	src/com/example/campuscreatures/MainActivity.java
Located source of database error, need to fix INSERT function
Merge pull request #31 from PJDesi/database

Fix yourself PJ.
Updated Readme and repository wiki