fixing merge
Merge branch 'master' of https://github.com/ReyesMagos/happy-pets