test
add BinZhou City
Adding my favorite food
Adding my favorite-feature
add food
add food
update my favorite food
Merge branch 'food-feature' of https://github.com/julieniscool/trainingtwo into food-feature
Manny food feature
Merge pull request #13 from MannyGu/food-feature

Manny Food feature
Merge pull request #12 from duyanwen/food-feature

accept add food
Merge branch 'food-feature' of https://github.com/julieniscool/trainingtwo into food-feature
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