Merge pull request #40 from PJDesi/playerDB

Player db
Merge pull request #8 from mtabor150/master

update
nada
copy pasted mainactivity
Merge branch 'master' of https://github.com/pmarti28/CampusCreatures

Conflicts:
	src/campuscreatures/main/MainActivity.java
Wrote code for pulling creatures from database to generate full Creature
Atlas. Issues with database still present.
Dummy array of creature names created to populate atlas in the meantime.
Fixed issue with app crashing with CreatureStatsActivity.
CreatureAtlas
Merge pull request #42 from Mr-Runtime/atlas

Atlas
pulling in James' changes
Merge branch 'master' into playerDB
initial location
initial changes
major modifications to battle mechs
Merge pull request #9 from mtabor150/master

update
location service working
Merge pull request #43 from pmarti28/master

battle mechanics modified
Merge branch 'master' into location
Trying to get everyone's changes
Created CreatureEntryActivity to navigate to from CreatureAtlas
Minor stylistic modifications to UI
Merge branch 'master' into playerDB