Add undo votes feature
Merge branch 'do-work'