Merge branch 'Maquetas' into Juan-Antonio
Merge branch 'Maquetas' into Idar
comit 18:16
Avances domingo 18.36
Merge branch 'Juan-Antonio' into Idar

Conflicts:
	css/pyxis.css
Merge branch 'Idar' into Maquetas