merged two remote branches
Merge branch 'addVoteToList'