creadas vistas y urls
solucionados conflictos
Merge branch 'master' of https://github.com/francom77/hackatorce
resultos conflictos