TUP-4 Implemenation to maim
Merge branch 'feature/master/TUP-4'

Conflicts:
	src/my/stomach/Stomach.java
Merge branch 'master' of https://github.com/xjguo/miam.git

Conflicts:
	src/my/stomach/Stomach.java -- xjguo