comit
Merge branch 'Idar' into Juan-Antonio
Commit para Johnny
commit carousel home
Commit Lunes 19.22
Merge branch 'Idar' into Juan-Antonio

Conflicts:
	css/pyxis.css
	less/layout.less
Revert 76bfbf6..63656a2

This rolls back to commit 76bfbf6ee40d977701ac7674ed885e1829025f90.
avance 19.29
Merge branch 'Juan-Antonio' into Idar
Revert ec6f373..5a96192

This rolls back to commit ec6f37379c25938fc4cd5b73c05e0428b6eda81b.
Home + carousel
Commit 15.00
Merge branch 'Idar' into Develop-Maquetas

Conflicts:
	css/pyxis.css
	less/dropdowns.less
	less/interaccion.less
	less/layout.less
	less/variables.less
	pagina-agenda.html
Header + Carousel Home
comienzo de noticias en Home
Commit para Johnny
Merge remote-tracking branch 'origin/Develop-Maquetas' into Juan-Antonio

Conflicts:
	css/pyxis.css
Avance martes 18:23
comit
Merge branch 'Juan-Antonio' into Develop-Maquetas

Conflicts:
	css/pyxis.css