setup
nate merge conflict resolution
Merge branch 'master' of https://github.com/shicholas/brews_best
Merge branch 'master' of https://github.com/shicholas/brews_best
voting works, not checking for multiple votes per user or beer
Merge branch 'master' of https://github.com/shicholas/brews_best
fixing merge
Merge pull request #1 from shicholas/voting

Voting