Adding my favorite-feature
Cynthilia need sugar
Merge branch 'food-feature' of https://github.com/julieniscool/trainingtwo into food-feature
Merge pull request #14 from luckysunshine/food-feature

accept Food feature
Merge branch 'food-feature' of https://github.com/julieniscool/trainingtwo into food-feature
XiaoWen food feature
Merge pull request #9 from Amy8203/food-feature

accept Food feature
Merge pull request #15 from xiaowenli66/food-feature

accept XiaoWen food feature
Merge branch 'food-feature' of https://github.com/julieniscool/trainingtwo into food-feature
my file change
add food
Merge pull request #18 from liting2014/food-feature

my file change
Merge branch 'food-feature' of https://github.com/julieniscool/trainingtwo into food-feature
Merge pull request #21 from gaomengna/food_feature

add food
Merge branch 'food-feature' of https://github.com/julieniscool/trainingtwo into food-feature
Merge pull request #10 from Cynthilia/food-feature

Cynthilia Food feature
delete jinghuang.txt