Merge pull request #25 from aqlien/PetModels

Fix New Pet.
Add placeholder images to pets
Fix merge conflicts.
Try to merge.
Merge pull request #29 from aqlien/images

Images
remove unneeded lines
Merge branch 'master' of github.com:aqlien/zoobit
fix breed not saving
switch update_happiness to private
Merge branch 'master' into happiness
add ability to feed pet