Nomas le agrege un hola! :o!!!!
Agregue el archivo mipreba.txt
modifique archivo
algo
Merge branch 'master' of https://github.com/2inqui/git
Se agregaron archivos
Merge branch 'master' of https://github.com/2inqui/git
Merge branch 'master' of https://github.com/2inqui/git into development_tanya
Agregue otro archivo para probar cosas! :0
modifique archivos de los demas
Merge pull request #1 from 2inqui/development_Carlos

Development carlos
Merge branch 'master' of https://github.com/2inqui/git into development_tanya
Merge pull request #2 from 2inqui/development_heber

cambios de Heber
Merge pull request #4 from 2inqui/development_tanya

Development tanya
Resolving conflicts
Merge pull request #6 from 2inqui/development_tanya

Development tanya
Fixed issue same name file
modificacion readme fix bug
Merge pull request #7 from 2inqui/development_jesus

modificacion readme fix bug
modificado por heber