Implement voting feature
Fix merge conflicts
Merge pull request #11 from jbwhite/joseph

Joseph