changes
Merge branch 'master' of https://github.com/objectParadigm/diner-ninja-dash
added method logic to add item to item category
deleted pictures
added dependent: :destroy to item categories
Merge branch 'master' of https://github.com/objectParadigm/diner-ninja-dash
changed line in application layout giving error
Merge branch 'item_category_entry'
merged item_categories
modified views to display items by category
Merge branch 'item_categories'
Merge branch 'master' of https://github.com/objectParadigm/diner-ninja-dash
Merge branch 'view_items_by_category'
seeds modified