ajustes en textos y títulos
Merge branch 'master' into elDorado
templates y links
Merge branch 'elDorado'
Merge branch 'master' of https://github.com/CitiSent/candidatometro

Conflicts:
	pages/de-que-hablan.md
Merge branch 'master' into gh-pages