Merge branch 'master' of https://github.com/mtabor150/CampusCreatures
Merge branch 'feature_ChooseCreatureAlertInBattleActivity'
nada
Merge pull request #16 from mtabor150/master

update
Merge branch 'master' of https://github.com/pmarti28/CampusCreatures into feature_lastStretch1
Fully implemented party class into mechanics
No longer implemented with creatureList
Merge pull request #62 from UhhmmNoel/Trapping

Trapping
Merge branch 'master' into location

Conflicts:
	src/campuscreatures/battleMechanics/BattleCreature.java
changes that didn't make it into last commit due to merge conflicts
Just committing
Merge pull request #63 from UhhmmNoel/master

Made abilites dynamically change based on creature level
Updating Repo
Merge branch 'master' into database
Added more creatures
Merge pull request #64 from PJDesi/database

Database
Google Map integration
Merge branch 'master' into googlemaps
Merge pull request #65 from mtabor150/googlemaps

Googlemaps
About to crash my computer thanks to mark
The random number is now equivalent to number of creatures in that area.