US1: Estos son mis cambios
Merge branch 'develop' of https://github.com/rarodriguez/git_training into develop