solve conflits
Merge branch 'master' of https://github.com/huaraco/foodie
add conflict checking
fine tune the style.css
add back button
ingredients page carousel random pick 5 images
add sad.png for no data found page