adding count functionality
Merge branch 'master' of github.com:Prechtig/E-Voting
added some count functionality
fixed conflict