remplacement de nom de variable
Merge branch 'master' of github.com:robotech-montpellier/projet_p8

Conflicts:
	src/robotics/plateau.cpp