Merge pull request #1 from jvcerver/master

primeros cambios de diego
Merge pull request #2 from jvcerver/master

añadidas las primeras lineas
Merge pull request #2 from diegogherrero/master

aaa