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

Conflicts:
	src/modele/header/pion.h
	src/modele/source/pion.c