change chili to spicyIngredient.
print the message "like to eat" on BranchM1
Merge branch 'master' into branchM1
jjjjj
000
pppp
Merge branch 'master' of https://github.com/qiongli/miam.git

Conflicts:
	src/my/food/ChaShaoBao.java
C1
TUP-3: Modify Stomach constructor to add a DanDanMian
TUP-3 print message "xxxx"