merging
Merge branch 'pet-shop-server' of https://github.com/jbaritz/ruby-course into pet-shop-server
Merge branch 'pet-shop-server' of https://github.com/jbaritz/ruby-course into pet-shop-server
merge prep
merge branch 'pet-shop-server' of https://github.com/jbaritz/ruby-course into pet-shop-server
Merge branch 'pet-shop-server' of https://github.com/jbaritz/ruby-course into pet-shop-server
merge prep
Adopted cats and dogs can be added to user
Merge pull request #2 from lemurgency/pet-shop-server

Pet shop server - Spenser