Commiting first part of voting work
Merge branch 'master' of https://github.com/mpkrueger/bloccit