modificado desde el portatil
Merge branch 'master' of https://github.com/pkogit/pruebas

Conflicts:
	prueba_texto1 - copia.txt

 and have 1 and 1 different commit each, respectively.