Add authentication through twitter
more tests for omniauth
fix merge conflict
Add breeds for all pets
begin oauth integration
Merge branch 'master' into happiness
fix happiness not decreasing
fix renaming pets bug
Fix merge conflicts.
Try to merge.