Merge branch 'Idar' into Maquetas
required index
margin
Merge branch 'Develop-Maquetas' into gh-pages
comit para recibir el Wrap
Merge branch 'Develop-Maquetas' into Juan-Antonio
Avance Home
Merge branch 'Develop-Maquetas' into Juan-Antonio

Conflicts:
	css/pyxis.css
avance home
Merge branch 'Develop-Maquetas' into Juan-Antonio

Conflicts:
	css/pyxis.css
commit de Home + pagina articulo agenda

avances, diagramación, incorporación de wrap.
Merge branch 'Juan-Antonio' into gh-pages
Categorización Wordpress

Se identifican los templates entre Post’s y Páginas (Variables)
Merge branch 'gh-pages' into Develop-Maquetas