...
Merge branch 'master' of https://github.com/x0r42/projet-A2

Conflicts:
	src/view/MapController.java