Merge branch 'tryingnewtemplate'
Merge branch 'gh-pages'
Arreglos en img header, textos y colores manos.
Merge branch 'master' into gh-pages

Conflicts:
	_config.yml