Primera sesion de Rokier
hola
Git new
nueva modificacion
nueva mod
Merge branch 'master' of https://github.com/BrechasTICs/curso-git

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

Conflicts:
	README.md