FUCK LE .GITIGNOREEEEEEEEEEEEEEEEEEEEEEEEEEE :p
Merge branch 'master' of https://github.com/TenWing/Halma

Conflicts:
	src/controleur/source/controleur.c
	src/controleur/test/testControleur.c
	src/controleur/test/testModele
	src/vue/source/vue.c
	src/vue/test/testModele
	src/vue/test/testvue.c