Writing tests for 1.02
Merge tag '1.02' into OO

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