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
git ignore for database.yml for ubuntu
ready for css and js
prelim brewery scaffolding
Merge branch 'master' of https://github.com/shicholas/brews_best
annotated models with rake annotate:models
added format=doc to rspec
registration with tests works, weirdly without confirmable
voting works, not checking for multiple votes per user or beer
Fixing merger errors
Merge branch 'master' into voting
Merge branch 'master' of https://github.com/shicholas/brews_best
fixing merge
Merge pull request #1 from shicholas/voting

Voting
prelim breweries
Fixing merge issues
brewery update
fixing merge issues fun times