errores merge
Merge branch 'master' of git@github.com:euriale/render
ficheros ordenados themes views imagenes