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

Conflicts:
	bin/MainActivity.apk
	bin/resources.ap_
Created SQLite database helper and initilizer
updated package name
Added location functions
Merge pull request #11 from mtabor150/init_creature

Init creature
Merge branch 'map' of https://github.com/PJDesi/CampusCreatures into PJDesi-map

Conflicts:
	bin/resources.ap_
Merge branch 'master' of https://github.com/pmarti28/CampusCreatures into pmarti28-master

Conflicts:
	bin/CampusCreatures.apk
	bin/MainActivity.apk
	bin/classes.dex
	bin/resources.ap_
Merge pull request #8 from mtabor150/master

fixing conflicts