created product_ingredient joint table, added index view to category
added create method to category_controller, added error message display to form
added show view to category, added 'set_category' method to controller
linked categories to products
merge conflict