Merge branch 'frontend'
implementation of thumbnails
correction of photo candidate example data
add url for thumbnails
update of gitignore
Merge branch 'master' of https://github.com/ciudadanointeligente/votainteligente-portal-electoral

Conflicts:
	.gitignore
	requirements.txt
	votainteligente/settings.py
:bowtie: display response of candidates in face to face view
for two candidates
add file question.yml
create tests for face to face view
display picture or name of a candidate depending of device
small correction on style
Merge pull request #22 from ciudadanointeligente/resalvacion

Esto está seleccionando a los dos candidatos desde la url para la comparación.
Travis se muere por que no tiene magick y no se qué wea!