LOL
Merge branch 'master' of https://github.com/romain-lefevere/monopoly

Conflicts:
	src/monopoly/gui/MonoPlateau.java