cambios
Merge branch 'master' of https://github.com/DSI-ETSII-ULL/Equipo-DJES
Merge branch 'master' of https://github.com/DSI-ETSII-ULL/Equipo-DJES
arreglando travis