Merge remote-tracking branch 'origin/master'

Conflicts:
	amm6364-RunVoting.in
	amm6364-RunVoting.out
	amm6364-TestVoting.c++
	amm6364-TestVoting.out
	awf299-TestVoting.c++
	awf299-TestVoting.out
	bkg389-RunVoting.out
	bkg389-TestVoting.c++
	cj8887-TestVoting.c++
	dab-RunVoting.out
	dab3554-RunVoting.out
	dmh2879-RunVoting.out
	dmh2879-TestVoting.c++
	dmh2879-TestVoting.out
	jg42437-RunVoting.out
	jg42437-TestVoting.c++
	jg42437-TestVoting.out
	jme2328-RunVoting.in
	jme2328-RunVoting.out
	jme2328-TestVoting.c++
	jme2328-TestVoting.out
	skz94-RunVoting.out
	spr573-RunVoting.in
	spr573-RunVoting.out
	spr573-TestVoting.c++
	spr573-TestVoting.out