eorf
Merge branch 'master' of github.com:xabufr/monopoly

Conflicts:
	monopoly
	src/game_graph/plateau.cpp
Merge branch 'master' of github.com:xabufr/monopoly

Conflicts:
	CMakeFiles/Makefile.cmake
	CMakeFiles/Makefile2
	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/link.txt
	monopoly
	src/game_graph/plateau.cpp
	src/game_graph/plateau.h
Merge branch 'master' of github.com:xabufr/monopoly

Conflicts:
	CMakeFiles/CMakeOutput.log
	CMakeFiles/Makefile2
	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/link.txt
	monopoly
	monopoly.cbp
	monopoly.layout
	src/game_graph/plateau.cpp
	src/game_graph/plateau.h