Implemented voting functionality.
Merge conflict fixes
Merge pull request #16 from NatalieFrecka/voting

Voting