Applied patch, testing code.
Merge pull request #10 from Zardvark/fix-voting-mechanics

Applied patch, testing code.