resolving a conflict
resolved conflict
User can only vote once.
Merge pull request #23 from lauyeung/update_form

updated css to align vote and review area with foundation grid
small change to fix spacing
Merge pull request #24 from lauyeung/update_form

small change to fix spacing
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
Resolved conflicts