adding keyGenerator
Deleted main?!!!
Merge branch 'master' of https://github.com/ashwinner/eVoting.git

Conflicts:
	src/main/Main.java