case propriete termine
Merge branch 'master' of https://github.com/xabufr/monopoly
case presque terminé, méthode joueurMonopole() de la classe GroupeTerrain à implémenter
Merge branch 'master' of https://github.com/xabufr/monopoly

Conflicts:
	CMakeCache.txt
	CMakeFiles/CMakeDirectoryInformation.cmake
	CMakeFiles/CMakeOutput.log
	CMakeFiles/Makefile.cmake
	CMakeFiles/Makefile2
	CMakeFiles/TargetDirectories.txt
	CMakeFiles/monopoly.dir/CXX.includecache
	CMakeFiles/monopoly.dir/DependInfo.cmake
	CMakeFiles/monopoly.dir/build.make
	CMakeFiles/monopoly.dir/cmake_clean.cmake
	CMakeFiles/monopoly.dir/depend.internal
	CMakeFiles/monopoly.dir/depend.make
	CMakeFiles/monopoly.dir/flags.make
	CMakeFiles/monopoly.dir/link.txt
	CMakeFiles/monopoly.dir/progress.make
	CMakeFiles/progress.marks
	Makefile
	cmake_install.cmake
	monopoly.layout
Méthode joueurMonopole() peutConstruir() et tarif() mise à jour
Merge branch 'master' of https://github.com/xabufr/monopoly

Conflicts:
	CMakeCache.txt
	CMakeFiles/CMakeDirectoryInformation.cmake
	CMakeFiles/CMakeOutput.log
	CMakeFiles/Makefile.cmake
	CMakeFiles/Makefile2
	CMakeFiles/TargetDirectories.txt
	CMakeFiles/monopoly.dir/CXX.includecache
	CMakeFiles/monopoly.dir/DependInfo.cmake
	CMakeFiles/monopoly.dir/build.make
	CMakeFiles/monopoly.dir/cmake_clean.cmake
	CMakeFiles/monopoly.dir/depend.internal
	CMakeFiles/monopoly.dir/depend.make
	CMakeFiles/monopoly.dir/flags.make
	CMakeFiles/monopoly.dir/link.txt
	CMakeFiles/monopoly.dir/progress.make
	CMakeFiles/progress.marks
	Makefile
	cmake_install.cmake
	monopoly.cbp
	monopoly.layout
	src/game/case/caseallerenprison.cpp
	src/game/case/casecarte.cpp
	src/game/case/casedepart.h
	src/game/case/caseprison.cpp
	src/game/case/casepropriete/casegare.h
	src/game/case/casepropriete/casepropriete.cpp
	src/game/case/casepropriete/casepropriete.h
	src/game/joueur.cpp
	src/game/joueur.h