vhjgh
Merge branch 'master' of https://github.com/bwencke/eastmonroe

Conflicts:
	viewCandidates.py