corrigiendo fallos
Merge branch 'rama_alberto'

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

Traigo de github
SingUp
Merge branch 'master' of github.com:DSI-ETSII-ULL/KWYJIBO

Mergeando
Merge branch 'rama_made'

mergeando
Gema
Arreglo mas cosas
Corrigiendo
Merge branch 'rama_alberto'

mergeo alberto
Merge branch 'master' of github.com:DSI-ETSII-ULL/KWYJIBO

Pulleando
Arreglando Errores
Corrigiendo Errores
Probando
Modeling Users