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
Delete application.yml
add energy/fullness, play w/ pet
Merge branch 'happiness' of github.com:aqlien/zoobit into happiness
Merge pull request #35 from aqlien/Foundation

Foundation
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
Merge pull request #37 from aqlien/Foundation

Add title bar that changes per page, improve top-bar.
Merge happiness and Foundation branches with master.
Pull from upstream master.
Oops wrong branch!