Merge branch 'Quentin'
zez
Merge branch 'master' of https://github.com/martialg/Agricola

Conflicts:
	src/interfaceGraphique/InterfacePlateauJoueur.java