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

Conflicts:
	src/modele/test/testModele