Merge branch 'testingMobile' of https://github.com/xdothackerx/zoobit into testingmobile
Merge branch 'master' of https://github.com/xdothackerx/zoobit into testingmobile
fixed user profile pets
Pull from upstream.