Agregue el archivo mipreba.txt
modifique archivo
algo
Merge branch 'master' of https://github.com/2inqui/git
Merge branch 'master' of https://github.com/2inqui/git into development_tanya
Merge pull request #4 from 2inqui/development_tanya

Development tanya