working on categories, added partials for category and food
merge conflict in index.html.erb
added jquery to the buttons
merge conflict