Composs pasto blando
Composs pasto blando donro bongo
Merge develop

Conflicts:
	Pruebas Git/public_html/index_2.html
Merge develop

Conflicts:
	Pruebas Git/public_html/index_2.html