almost done :)
merge !
Merge branch 'master' of https://github.com/Buldofr/MiniProjetPOO

Conflicts:
	src/supplymanager/PhysicalObject.java
	test/supplymanager/time/DateTest.java

merge
Merge branch 'master' of https://github.com/Buldofr/MiniProjetPOO
finalising merge