Merge branch 'Maquetas' into Idar
Avances domingo 18.36
Merge branch 'Juan-Antonio' into Idar

Conflicts:
	css/pyxis.css
Commit para Johnny
Merge branch 'Idar' into Juan-Antonio