prueba
Merge branch 'master' of github.com:DSI-ETSII-ULL/2014-Team-Victor into aux
Merge branch 'master' of github.com:DSI-ETSII-ULL/2014-Team-Victor into aux
test
Subiendo los test para el modelo de usuarios
Merge branch 'aux'