Writing tests for 1.04
Merge tag '1.04' into OO

Conflicts:
	src/main/java/br/ufpb/dce/aps/coffeemachine/Messages.java
Implementation: Wrinting test for 1.04