gch
Merge branch 'master' of
https://github.com/MoistyMoist/PetSociety-for-Android.git

Conflicts:
	petsociety/bin/classes.dex
	petsociety/bin/petsociety.apk
	petsociety/bin/resources.ap_