fix failing test
Merge branch 'master' into navigation-and-navbar
fixing the failing tests - what fun!
Merge pull request #34 from avifoxi/navigation-and-navbar

Navigation and navbar
add feature test user_clicks_upvote, add vote controller and associated generated files
add votes controller with skeleton routes - will need some working out in the config/routes file
Merge pull request #35 from avifoxi/votes-controller

add votes controller with skeleton routes - will need some working out i...
resolve merge conf
add route to create prompt vote in config/routes
add upvote functionality, passing first feature test
add downvote functionality, passes first feature test, add validation to votes model polarity
add check_for_duplicates method in vote model, should be a validation but refactor later. passing tests
Merge pull request #36 from avifoxi/voting-feature-test

Voting feature test - controller too fat - REFACTOR