implemented basic voting page.
fixed merge conflicts