Merge branch 'gh-pages'
Merge branch 'gh-pages'
simplificación de nombres en variables
...
Merge branch 'master' into gh-pages