Merge pull request #1 from jroogaa/master

documento text
nuevas lineas de texto
texto 2
Merge remote-tracking branch 'update/master'