Implemented voting
Merge voting into master