Merge branch 'master' into gh-pages
Merge branch 'Catalina' into gh-pages

Conflicts:
	css/stampa.css
Merge branch 'develop'
Merge branch 'master' into gh-pages

Conflicts:
	css/stampa.css
	index.html
	less/iconos-lista.less
	less/iconos-ruta.less
	less/iconos-variables.less
	src/selection.json
ajustes
Merge branch 'develop'
Merge branch 'develop' into gh-pages
Merge branch 'develop'
cambios en html
herbert el imbécil
Merge branch 'develop'
css
Merge branch 'master' into develop
pruebas iconos
Se desarrollan iconos en 8px
Ajuste grosor iconos
Ajuste de los iconos
Comentarios para indexación de iconos
Arreglos html
Apariencia ghpages