Added upvote/downvote button to beers index
fixed merge conflicts with master
Merge pull request #20 from Mcscott142/user_views_beer_and_adds_review

Adding reviews to a beer