Mejorado error.ejs para no mostrar undefined.
Merge branch 'tema1' into tema2
Merge branch 'tema2' into tema3
Merge branch 'tema3' into tema4
Merge branch 'tema4' into tema5
Merge branch 'tema5' into tema6
Merge branch 'tema6' into tema7