voting
Merge pull request #22 from JoshuaNotowitz/master

voting