finished voting restrictions
Merge branch 'master' into voting_restrictions
Merge pull request #11 from bengolden/voting_restrictions

Voting restrictions