Merge branch 'master' into user-logged-in
refactor answers from the show question view to their own partial
Merge branch 'master' into answer-scores
add failing tests for upvoting an answer
implement upvoting of answers, including specs
Merge branch 'master' into user-logged-in
resolve merge conflicts
Merge branch 'master' of https://github.com/purple-martins-2013/snack-overflow