Keep it simple stupid
fix error banch
fix zz
fix criterio

qqq
fix criterio 2
fix res
ff
dsdsd
qqq
werwer
qqq
conflicto de mierda
asdasfdsfds
wwww
Merge branch 'Desarrollo' of https://github.com/htrdev/RubricaEpis into Desarrollo