zwzhaotest1 commit
zwzhaotest1
Merge branch 'master' of https://github.com/wchen-talend/miam.git

Conflicts:
	src/my/stomach/Stomach.java