tup4.6 commit
tup4.6 commit
tup4.6 commit
Merge branch 'feature/tup-4.6' of
https://github.com/wchen-talend/miam.git into feature/tup-4.6

Conflicts:
	src/my/stomach/Stomach.java