creation pion deplacement
Merge branch 'master' of github.com:xabufr/monopoly

Conflicts:
	CMakeFiles/monopoly.dir/CXX.includecache
	CMakeFiles/monopoly.dir/depend.internal
	monopoly
Merge branch 'master' of github.com:xabufr/monopoly

Conflicts:
	CMakeCache.txt
	CMakeFiles/CMakeCCompiler.cmake
	CMakeFiles/CMakeCXXCompiler.cmake
	CMakeFiles/CMakeDetermineCompilerABI_C.bin
	CMakeFiles/CMakeDetermineCompilerABI_CXX.bin
	CMakeFiles/CMakeDirectoryInformation.cmake
	CMakeFiles/CMakeOutput.log
	CMakeFiles/CMakeSystem.cmake
	CMakeFiles/CompilerIdC/CMakeCCompilerId.c
	CMakeFiles/CompilerIdC/a.out
	CMakeFiles/CompilerIdCXX/CMakeCXXCompilerId.cpp
	CMakeFiles/CompilerIdCXX/a.out
	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/flags.make
	CMakeFiles/monopoly.dir/link.txt
	Makefile
	cmake_install.cmake
	monopoly
	monopoly.layout
	src/game_graph/plateau.cpp
Merge branch 'master' of github.com:xabufr/monopoly

Conflicts:
	CMakeFiles/monopoly.dir/CXX.includecache
	monopoly
Merge branch 'master' of 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/flags.make
	CMakeFiles/monopoly.dir/link.txt
	Makefile
	cmake_install.cmake
	monopoly
	src/game_graph/plateau.cpp