Admin can now create bourbonpages, visitors can view featured bourbons
Fixed indentations, added before filter to admin
Added vanity urls to bourbons
Implemented Paperclip, Admin can add picture to bourbon page
Fix merge conflicts

Conflicts:
	Gemfile
	app/controllers/application_controller.rb
	app/controllers/bourbons_controller.rb
	app/models/bourbon.rb
	app/models/user.rb
	app/views/bourbons/show.html.erb
	app/views/dashboards/show.html.erb
	config/routes.rb
	db/schema.rb
Merge pull request #6 from wowenstine/rf-add-bourbon-picture

Rf add bourbon picture