hopefully this commit works
please work
Merge branch 'master' of https://github.com/eschenau/cs313e-voting

Conflicts:
	Voting.py