added individual food page
added individual food page
fixed app.js merge conflict
added food.js