Changes
fix merge conflict
Merge branch 'master' of https://github.com/RandyDavis/MealMe
can add name and category to database