Added breweries and a couple other changes
Merge branch 'master' of github.com:mcelaney/rate-mugwarrior

Conflicts:
	app/models/beer.rb
	config/routes.rb
	coverage/.last_run.json
	coverage/.resultset.json
	coverage/index.html
	db/schema.rb
	spec/models/beer_spec.rb
	spec/spec_helper.rb