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

Conflicts:
	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/flags.make
	CMakeFiles/monopoly.dir/link.txt
	CMakeFiles/monopoly.dir/progress.make
	CMakeFiles/progress.marks
	monopoly.cbp