Ajout des gares
Merge remote-tracking branch 'upstream/master'
Méthodes terminées, à tester à la compilation
Merge branch 'master' of https://github.com/lPadier/TP-MEDEV
Resolution des erreurs de compilation
Merge branch 'master' of https://github.com/lPadier/TP-MEDEV

Conflicts:
	src/monopoly/Joueur.java
Merge branch 'master' of github.com:lPadier/TP-MEDEV

Conflicts:
	src/monopoly/PlateauJeu.java
Merge branch 'master' of https://github.com/lPadier/TP-MEDEV
Merge pull request #7 from lovasoa/master

Ajout des gares
Merge branch 'master' of https://github.com/lPadier/TP-MEDEV
Tout compile
Merge pull request #8 from oliviernguyenquoc/master

Joueur fini
NoMoreMoney.java
Merge pull request #9 from oliviernguyenquoc/master

Ajout du fichier NoMoreMoney
Mise a jour de Plateau et Monopoly.java
merge