renamed return variable
Merge branch 'master' of https://github.com/TheChymera/PyVote

Conflicts:
	functions.py