Merge branch 'master' into elDorado
Merge branch 'gh-pages' into elDorado
navbar-collapse hide on mobile
totales
Merge branch 'elDorado'

Conflicts:
	css/candidatometro.css
Merge branch 'master' into gh-pages