trouverObjet affectation de la vie
Merge branch 'master' of https://github.com/ArthurRobert/IGI1031

Conflicts:
	Jeu_Table_Ronde/src/testUnitaire/TestSac.java
Merge branch 'master' of https://github.com/ArthurRobert/IGI1031