Movable
Merge branch 'master' of https://github.com/lovasoa/cours-objet-ecn

Conflicts:
	src/sirop/Obstacle.java