Fixed some merging issues

Had to change some food item controller stuff.
- FoodItemsController now inherits from the application controller.
(Error occurred with Usercontroller::User)