8 de diciembre
Merge branch 'stephys' of https://github.com/ReyesMagos/happy-pets into stephys

Conflicts:
	happy-pets-webpage/views/layout.ejs