Add branch Feature/TUP-4
fix bug TUP-4
Merge branch 'Feature/TUP-4' of https://github.com/wwang-talend/miam
Merge branch 'master' of https://github.com/wwang-talend/miam

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