Debugging
Merge branch 'master' into database
initial zone files
Updated file layout, created libs folder with a dependendent file, and updated .gitignore to allow .jar lib files
More updates
Modified DatabaseHelper class. Shows no errors when inserting creature to database. Still need a textview button to display creatures in the database just to make sure. Also started the PlayerDatabase class.
Merge pull request #6 from mtabor150/master

simple update
Doing What Mark Says
Still doing what mark says, even though he messed up James' computer
Merge branch 'master' into playerdb
Oh you know, just trying to boost my klocs
Merge pull request #34 from PJDesi/playerdb

Playerdb
Merge pull request #7 from mtabor150/master

database update
Completely rearranged the interface and the order in which creatures attack each other.
Merge branch 'feature_BattleMechanicsRevision'
Merge pull request #35 from pmarti28/master

reconstructed battle mechanics and user interface
Added new fragments for MainActivity. Built UI for Swipe Views
Modified MainActivity and updated API minimum level to 11. This one goes to 11.
Merge branch 'master'

Conflicts:
	res/layout/activity_main.xml
	src/campuscreatures/main/MainActivity.java
Merge pull request #36 from Mr-Runtime/master

My First Legit Pull Request that I'm Proud Of