modifique archivos de los demas
Merge branch 'master' of https://github.com/2inqui/git into development_tanya
Resolving conflicts
Merge pull request #6 from 2inqui/development_tanya

Development tanya