modification
modification des etat
Merge branch 'master' of https://github.com/Falilou/SimulateurRobot

Conflicts:
	Robot.o
	main_robot
	main_robot.o