Composs pasto blando
Merge develop

Conflicts:
	Pruebas Git/public_html/index_2.html