fix 7 y agregada consulta desnormalizada
Merge branch 'master' of https://github.com/krahser/BBDD1