Deshincronizando cosas.
Merge branch 'master' of https://github.com/mshelzr/MyRepositorioOne.git

Conflicts:
	MiTexto.txt