Merge pull request #21 from aqlien/PetModels

Pet models
Merge pull request #23 from aqlien/PetModels

Pet models fixed.
fix gemfile for heroku
Merge branch 'master' of github.com:aqlien/zoobit
fix gemfile for heroku
begin oauth integration
Merge branch 'master' into happiness
fix happiness not decreasing