cambios en rama ppal master
Merge branch 'rama_clon4'
conflicto solucionado
Merge remote-tracking branch 'origin/liq' into clon4

Conflicts:
	github2/carpeta1/hoja2.html