Merge pull request #1 from LSOO/master

commit de Luis Santiago
primer commit david plaza.
Merge pull request #2 from davidplaza20/master

primer commit david plaza.
dasd
Merge pull request #3 from vaquiceno/master

dasd