corrigiendo fallos
Merge branch 'rama_alberto'

Mergeando al comprobar errores
Merge branch 'master' of github.com:DSI-ETSII-ULL/KWYJIBO

Traigo de github