tercero

commt de prueba
Commit prueba Idar-Juan
Merge branch 'Idar' into Juan

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