TUP-3
Merge branch 'master' of https://github.com/yyanwang/miam

Conflicts:
	src/my/stomach/Stomach.java