tercer commit
Merge pull request #1 from pelguera/desarrollo

tercer commit