Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Cambios del Modulo 6.
Cambios en el archivo .gitignore para trabajar bajo mac
Merge branch 'feature-module.6' into develop