Writing test for 3.02
Writing test for 3.03
Merge tag '3.03' into COMPOR

Conflicts:
	src/main/java/br/ufpb/dce/aps/coffeemachine/Messages.java
	src/test/java/br/ufpb/dce/aps/coffeemachine/CoffeeMachineTest.java
Task 3.03 finished for COMPOR
Writing test for 3.04
Merge tag '3.04' into COMPOR
Task 3.04 finished for COMPOR
Writing test for 3.05
Merge tag '3.05' into COMPOR
Task 3.05 finished for COMPOR