i dont even know
fixed merge conflicts
Merge branch 'friends' of https://github.com/xdothackerx/zoobit into friends
search?
fixed merge conflicts
Tweak pet stats.
Merge from master.
Merge branch 'master' of https://github.com/xdothackerx/zoobit into addFriends
Adjust pet stat behavior.
More tweaking of pet stats and interaction.
finished search to add friends
Merge from upstream.
Fix merge conflicts.
completed delete friends
Add mood based events for pets.
Merge pull request #100 from xdothackerx/addFriends

Add friends
Merge pull request #97 from xdothackerx/PetModels

Pet models
Merge in deleteFriends branch.
fixed search issue
merging with master