esto no es de nuevo un intento de prueba
 Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/ccastroh/CI-1331-Lab-1

Conflicts:
	hola.txt
Merge branch 'master' of https://github.com/ccastroh/CI-1331-Lab-1
es no es de nuevo una prueba
:Merge branch 'master' of https://github.com/ccastroh/CI-1331-Lab-1

Conflicts:
	hola.txt