Writing test for 3.04
Merge tag '3.04' into COMPOR

Conflicts:
	src/test/java/br/ufpb/dce/aps/coffeemachine/CoffeeMachineTest.java
Task 3.04 finished for COMPOR