Estructura spec
Primeras pruebas
Merge branches 'ivan' and 'master'
Merge branches ivan into master