no changes?
Merge branch 'master' of https://github.com/3olcin/CIS4340_VirtualPet

Conflicts:
	AndroidManifest.xml