Update README.md
Update README.md
Merge branch 'master' into develop
Stampa
Error circulo-l
Merge branch 'develop'
Merge branch 'master' into gh-pages
Cambios por arreglo estorninos
Cambios nombres
Merge branch 'develop'

Conflicts:
	fonts/stampa-webfont/Stampa.svg
Actualización
Merge branch 'master' into gh-pages