Merge branch 'Beta-1.0' into Idar
Commit prueba 1
Commit prueba Idar-Juan
Merge branch 'Idar' into Juan

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

Conflicts:
	css/lgg.css