commit de Luis Santiago
Merge pull request #1 from LSOO/master

commit de Luis Santiago
Merge pull request #2 from davidplaza20/master

primer commit david plaza.