Merge correction
Merge branch 'pet-shop-server' of https://github.com/gmikeska/ruby-course into pet-shop-server

Conflicts:
	lib/petshops_repo/petshops_repo.rb