registro modificado
Merge branch 'funcionalidad' of github.com:DSI-ETSII-ULL/Django-Unchained into funcionalidad

pulleando
Sbiendo
Merge branch 'master' of github.com:DSI-ETSII-ULL/Django-Unchained

pulleando