my final commit hopefully
Merge branch 'master' of https://github.com/jaegs/voting_system