k
Merge branch 'Deliberations' of https://github.com/EGC-1415-Repositorio-compartido/repvoting into Deliberations

Conflicts:
	install.sh