Fully implemented party class into mechanics
No longer implemented with creatureList
Merge branch 'master' into location

Conflicts:
	src/campuscreatures/battleMechanics/BattleCreature.java
changes that didn't make it into last commit due to merge conflicts
Beginning to implement map zones to find current zone
minor bug fixes in misc. files
Merge branch 'master' into location
Fun things are happening in this commit
Conflicts:
	src/campuscreatures/database/MapZones.java
	src/campuscreatures/main/MainActivity.java
	src/campuscreatures/main/TrapCreaturesActivity.java
Everything is fixed :))))))))
YAy
Merge branch 'master' into location
fjkdls;ajfkdls;a
Testing location services. I'm in Ritter. It doesn't think I'm in Ritter
Merge branch 'master' into location

Conflicts:
	src/campuscreatures/main/BattleActivity.java
	src/campuscreatures/profile/UserProfile.java
Merge pull request #69 from Mr-Runtime/location

Location