Implemented voting
Voting
Fix merge