ajustes al gitignore
Merge branch '_javascript'

Conflicts:
	.gitignore
Merge remote-tracking branch 'origin/develop'

Conflicts:
	css/ego.css
pyxis actualización Master
Merge branch 'Juan-Antonio'

Conflicts:
	css/pyxis.css
	javascript.html
	layout.html
	less/pagina.less
eliminación de ego (Por completo)
Pag "simon.html" con nav class='permanente'
Merge branch 'Juan-Antonio'

Conflicts:
	css/pyxis.css
Comit para Simón
Merge branch 'develop' into gh-pages
Merge branch 'gh-pages'

Conflicts:
	.gitignore
	css/pyxis.css
	javascript.html
	layout.html
	less/navs.less
	less/patrones.less
	less/pyxis.less
yes yes
Merge branch 'develop'

Conflicts:
	css/pyxis.css
	pags_antiguas/index.html
ok
fixed conflicts
Merge branch 'master' into develop