TUP-4 commited:try again for all.
Merge branch 'Feature/TUP-4'

Conflicts:
	src/my/stomach/Stomach.java
TUP-4:test again.