first commit
Merge https://github.com/jppastor/prueba