fix breed not saving
switch update_happiness to private
Merge branch 'master' into happiness
add ability to feed pet
fix live OAuth info
Delete application.yml
add energy/fullness, play w/ pet
Merge branch 'happiness' of github.com:aqlien/zoobit into happiness
fix happiness refresh issue
resolve merge conflict
rename foundation framework
remove unneeded foundation imports
resolve merge conflicts
Merge pull request #33 from aqlien/happiness

Happiness Features v2