cambios de Heber
Merge pull request #2 from 2inqui/development_heber

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

Development tanya
Resolving conflicts