Cambios en index.html
Merge remote-tracking branch 'curso/devel' into devel

Conflicts:
	index.html
Merge remote-tracking branch 'curso/devel' into devel