Cambio textos, agrega logo
Merge branch 'master' into gh-pages