twitter auth works
Resolving Merge conflicts
fix user.rb file
fixed gemfile
updated bundle
fixed header styling
added stub for heroku
dropdown for brewery selection
Fixing Errors
changed beers/index and precompiled assets for heroku
Merge branch 'master' of https://github.com/shicholas/brews_best

Conflicts:
	app/models/user.rb
	db/schema.rb
Merge branch 'master' of https://github.com/shicholas/brews_best
Update database.yml
updated index slim for brewery names and seeds file
updated gemfile with rails12_factor gem for rails 4 on heroku
merged with brewery info