Merge remote-tracking branch 'origin/Beta-1.0' into Catalina
HMTL iconos
Cambiando columnas
Merge remote-tracking branch 'origin/Beta-1.0' into Catalina
Merge branch 'Beta-1.0' into Juan
comiteoo
Merge branch 'Juan' into Beta-1.0
Ajuste Typo
Merge branch 'Beta-1.0' into Juan
Incorporación íconos a less
Merge branch 'Catalina' into Beta-1.0
Cambios en barra de navegación
Se agrega iconografia al menu
Cambios en iconografia.html
Se eliminan conflictos
Descripción iconografía
composicion texto-imagen

versatilidad
fondo y +
Merge branch 'Beta-1.0' into Juan

Conflicts:
	css/lgg.css
Merge branch 'Juan' into Beta-1.0