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
Revert "Merge pull request #35 from Mr-Runtime/master"

This reverts commit d9d4263f5247c6bd5b40a46e60680c30f924fc44, reversing
changes made to 88ccc6cc3378aea989b0564685ed8689138e1e65.
Merge pull request #38 from mtabor150/revertMerge

Revert "Merge pull request #35 from Mr-Runtime/master"
Finally pushing UI with Swipe Views
WORKING CODE WITH SWIPE VIEW UI!!!!!!!!!!!
Merge pull request #39 from Mr-Runtime/swipe

Swipe that works!
Dang deer database be goooood

:q
Merge branch 'master' into playerDB

Conflicts:
	src/campuscreatures/main/MainActivity.java
Merge pull request #40 from PJDesi/playerDB

Player db
Merge pull request #8 from mtabor150/master

update