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

Conflicts:
	src/vue/source/vue_plateau.o