Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of https://github.com/CitiSent/candidatometro into gh-pages
Update the chart
Merge branch 'develop'
Merge branch 'master' into develop
Merge branch 'master' of https://github.com/CitiSent/candidatometro
Merge branch 'master' into develop
Update the de-que-hablan
Merge branch 'develop'
Merge branch 'master' into gh-pages
Merge branch 'elDorado'
Merge branch 'master' of https://github.com/CitiSent/candidatometro

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