continuo trabajando con branch liq
cambios en rama liq de clon4
Merge branch 'rama_clon4'
hago un cambio que no deberia ser
conflicto solucionado
Merge remote-tracking branch 'origin/liq' into clon4

Conflicts:
	github2/carpeta1/hoja2.html
Merge remote-tracking branch 'origin/master' into betovone