add aa by msjian
Merge branch 'master' of https://github.com/yyin-talend/miam
Merge branch 'master' of https://github.com/yyin-talend/miam
TUP-4: Modify Stomach constructor to add a ChaShaoBao msjian
2nd
fix conflict
2nd
delete last
Merge branch 'feature/TUP-4' of https://github.com/yyin-talend/miam into
feature/TUP-4

Conflicts:
	src/my/stomach/Stomach.java