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

Conflicts:
	bin/halma
	build/source/controleur.o
	build/source/plateau.o