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
dah
Merge pull request #17 from mtabor150/master

google maps update and a bunch of other stuff
Merge branch 'master' of https://github.com/pmarti28/CampusCreatures into feature_lastStretch1

Conflicts:
	src/campuscreatures/main/MainActivity.java
updating library
Merge branch 'master' of https://github.com/mtabor150/CampusCreatures
Merge branch 'master' into feature_lastStretch1
PJ is a stupid flip
Merge pull request #68 from pmarti28/feature_lastStretch1

Feature last stretch1