added Brewery_DB api
changed home page to show current users page if logged in
adds category names from Brewery db
creates beer importer for db
modified beer and online brews controller
modified routes to show new beer info
made changes to show beer cats and styles
adds columns to style, category, and beers models
styles controller and views
category, style, and beers models and changed online brews index view
specs and stylesheets created when models and contollers were made
removed some crap that was interferring with db loading
removed conflicting column from beer model and updated schema
fixed style and beer page to show each beer and styles
refactored controller and deleted unused files/folders
added simplecov for tests and deleted unused controller
trying to do some stuff with admin
gemfile changes
Merge branch 'inception'

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/styles.css.scss
	app/controllers/beers_controller.rb
	app/controllers/categories_controller.rb
	app/controllers/styles_controller.rb
	app/models/beer.rb
	app/models/style.rb
	app/models/user.rb
	app/views/beers/show.html.erb
	app/views/categories/index.html.erb
	app/views/layouts/_navbar.html.erb
	app/views/layouts/application.html.erb
	app/views/styles/show.html.erb
	config/routes.rb
	db/schema.rb
Merge branch 'inception'

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/styles.css.scss
	app/controllers/beers_controller.rb
	app/controllers/categories_controller.rb
	app/controllers/styles_controller.rb
	app/models/beer.rb
	app/models/style.rb
	app/models/user.rb
	app/views/beers/show.html.erb
	app/views/categories/index.html.erb
	app/views/layouts/_navbar.html.erb
	app/views/layouts/application.html.erb
	app/views/styles/show.html.erb
	config/routes.rb
	db/schema.rb