Sistemati i test
Merge branch 'master' of https://github.com/Pagno/MaguttoManager.git
Test
Merge branch 'master' of https://github.com/Pagno/MaguttoManager.git

Conflicts:
	test/controller/greedy/GreedyEngineTest.java
Merge branch 'master' of https://github.com/Pagno/MaguttoManager.git

Conflicts:
	test/controller/greedy/GreedyEngineTest.java
Aggiunti i test in RichiestaTest dei metodi inConflitto() e collide()
Merge branch 'master' of https://github.com/Pagno/MaguttoManager.git