change categories link on root
change product model and the show_product view to trigger order_item#create
add associations between Category and Product model
fix merge conflict
t
add comments to products controller to help remember future changes
add categories#new method and create new_category view
add uniqueness validation to Product model
add categories#create method
add categories#create action
change form so that user can select several categories
Add categories index page to check up on what I'm doing
trying to display created categories on new_product form
woohoo category names pop up into the new_product form now
add show_category action, and update root page in order to see things that have been done
clean up products_controller
create Categories_Products join table
Merge branch 'master' into products

Conflicts:
	app/controllers/application_controller.rb
	app/views/layouts/application.html.erb
	db/schema.rb
change root_path to home_path to follow routes
Merge branch 'master' into products

Conflicts:
	db/schema.rb