resolution conflit
Merge branch 'master' of https://github.com/TenWing/Halma

Conflicts:
	src/modele/header/coup.h
	src/modele/test/testModele.c

resolution conflit 2