Medic
Merge branch 'master' of https://github.com/zarov/EurockSimulation

Conflicts:
	src/main/java/fr/utbm/gi/vi51/g3/motion/agent/Attendant.java