changes to virtual_pet
Merge branch 'master' of https://github.com/mjneil/midwest-hacks

Conflicts:
	virtual_pet/virtual_pet.js