Merge pull request #7 from nibata/otra_rama

Otra rama
Merge pull request #8 from nibata/otra_rama

hola mundo
Update Nuevo documento de texto.txt
Merge remote-tracking branch 'origin/otra_rama'

Conflicts:
	Nuevo documento de texto.txt
Merge branch 'master' into otra_rama