Fixed collector, keygenerator and still fixing main
Merge branch 'master' of https://github.com/ashwinner/eVoting.git
Fixing issue in keygenerator. Making other small fixes.