Escribi algo en Master
Merge branch 'master' of https://github.com/BrechasTICs/curso-git
TAREA
escribi algo
Merge branch 'Branch-1'

Conflicts:
	README.md
Merge branch 'master' of https://github.com/BrechasTICs/curso-git

Conflicts:
	README.md