Create add/delete category functionality
Fix merge conflicts
Merge pull request #53 from ricarora/product_categories

Product categories