resolving a conflict
resolved conflict
User can only vote once.
test that a user can only vote once is green.
fixed conflicts to show page
Merge pull request #25 from lauyeung/user-votes-once

User votes once