Merge branch 'Beta-1.0' into Gabriela
Merge branch 'Juan' into Gabriela

Conflicts:
	css/lgg.css
Merge branch 'Juan' into Gabriela

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

Conflicts:
	css/lgg.css
	less/auxiliares.less
	less/interaccion.less
Merge branch 'Beta-1.0' into Gabriela

Conflicts:
	css/lgg.css
	less/auxiliares.less
	less/interaccion.less
Merge branch 'Beta-1.0' into Idar
Comit de prueba
Revert "Merge branch 'Beta-1.0' into Idar"

Conflicts:
	css/lgg.css
Cambionull
Beta 1.0 a mi branch

Agregue archivos actualizados a mi branch
Tipografía agregada

Neuton webfont
Tipografia Neuton agregada a Beta 1.0

Neuton webfont
Merge branch 'Gabriela' into Beta-1.0

Conflicts:
	css/lgg.css
	fonts/Neuton/generator_config.txt
	fonts/Neuton/neuton-bold-demo.html
	fonts/Neuton/neuton-bold-webfont.eot
	fonts/Neuton/neuton-bold-webfont.svg
	fonts/Neuton/neuton-bold-webfont.ttf
	fonts/Neuton/neuton-bold-webfont.woff
	fonts/Neuton/neuton-extrabold-demo.html
	fonts/Neuton/neuton-extrabold-webfont.eot
	fonts/Neuton/neuton-extrabold-webfont.svg
	fonts/Neuton/neuton-extrabold-webfont.ttf
	fonts/Neuton/neuton-extrabold-webfont.woff
	fonts/Neuton/neuton-extralight-demo.html
	fonts/Neuton/neuton-extralight-webfont.eot
	fonts/Neuton/neuton-extralight-webfont.svg
	fonts/Neuton/neuton-extralight-webfont.ttf
	fonts/Neuton/neuton-extralight-webfont.woff
	fonts/Neuton/neuton-italic-demo.html
	fonts/Neuton/neuton-italic-webfont.eot
	fonts/Neuton/neuton-italic-webfont.svg
	fonts/Neuton/neuton-italic-webfont.ttf
	fonts/Neuton/neuton-italic-webfont.woff
	fonts/Neuton/neuton-light-demo.html
	fonts/Neuton/neuton-light-webfont.eot
	fonts/Neuton/neuton-light-webfont.svg
	fonts/Neuton/neuton-light-webfont.ttf
	fonts/Neuton/neuton-light-webfont.woff
	fonts/Neuton/neuton-regular-demo.html
	fonts/Neuton/neuton-regular-webfont.eot
	fonts/Neuton/neuton-regular-webfont.svg
	fonts/Neuton/neuton-regular-webfont.ttf
	fonts/Neuton/neuton-regular-webfont.woff
	less/tipografias-web.less
Merge branch 'Beta-1.0' into Idar

Conflicts:
	css/lgg.css
Revert "Merge branch 'Gabriela' into Beta-1.0"

This reverts commit 6eb7e4d77d8e0df64dec81ede0ec3495ce32655a, reversing
changes made to b25a1411715e099fd31174433a1608ed4ef33fe2.
Construcción formulario registro

Se arma el formulario de la Wiki Casiopea, donde el usuario puede
registrarse, aún faltan definir botones y detalles, además de las
variables al cambiar desde Alumno > Profesor > Amigo > Otro.
Merge branch 'Idar' into Beta-1.0

Conflicts:
	css/lgg.css
Ajustes pesos tipo

menú, links y titulos
Merge branch 'Gabriela' into Beta-1.0

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

Conflicts:
	css/lgg.css
	less/auxiliares.less