feature TUP-4 commited:commited the changes of TUP-4.
Modify Stomach constructor to add a DanDanMian inside
(foodsInside.add()).
Merge branch 'feature/TUP-4' of https://github.com/dlin-talend/miam into
feature/TUP-4

Conflicts:
	src/my/stomach/Stomach.java
Merge remote-tracking branch 'origin/feature/TUP-4'
TUP-4:change the constructor again for test merge.
TUP-4:change the material.
for TUP-4:test
TUP-4:test for merge
Merge remote-tracking branch 'origin/feature/TUP-4'
TUP-4:change the master for test rebase on branch