Conflict resolution
Merge branch 'master' of https://github.com/mtabor150/CampusCreatures

Conflicts:
	bin/MainActivity.apk
	bin/resources.ap_
Added location functions
Merge branch 'map' of https://github.com/PJDesi/CampusCreatures into PJDesi-map

Conflicts:
	bin/resources.ap_