update petshop.rb
merge changes