Tup 4 finished.
tup4 finished.
Merge branch 'feature/TUP-4' of https://github.com/zshen-talend/miam
into feature/TUP-4

Conflicts:
	src/my/stomach/Stomach.java
Merge branch 'master' of https://github.com/zshen-talend/miam

Conflicts:
	src/my/stomach/Stomach.java