Merge branch 'master' into gh-pages
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
normalize

en chrome se veía mal
cambios diversos

1.colores
2. ajustes javascript
Merge branch 'gh-pages' into develop