Merge branch 'submissions' of https://github.com/alfredormz/elecciones-limpias into alfredormz-submissions

Conflicts:
public/js/main.js
views/index.haml