annotated models with rake annotate:models
added format=doc to rspec
registration with tests works, weirdly without confirmable
Fixing merger errors
Merge branch 'master' into voting
prelim breweries
Fixing merge issues
brewery update
fixing merge issues fun times
Think I got it all sorted out
Ok last time, maybe?
I make a typo
Update database.yml
prelim breweries
more
Merge branch 'master' of https://github.com/shicholas/brews_best
twitter auth works
Resolving Merge conflicts
fix user.rb file
added new route for forcing vote
Merge branch 'master' of https://github.com/shicholas/brews_best into voting