Merge branch 'gh-pages' into elDorado
Nuevo layout horizontal, nuevos textos
Merge branch 'elDorado'
Merge branch 'master' into gh-pages
ajuste de tabla al modelo de datos
Merge branch 'elDorado'
Merge branch 'master' into gh-pages