IncorporationMAJ_PY
Merge branch 'master' of https://github.com/phervo/ProjetRD48

Conflicts:
	Sources/C++/Projet1/Projet1.sdf
	Sources/C++/Projet1/Projet1.v12.suo
	Sources/C++/Projet1/Projet1/Projet1.vcxproj
	Sources/C++/Projet1/Projet1/Projet1.vcxproj.filters
	Sources/C++/Projet1/Projet1/Source.cpp
	Sources/C++/Projet1/Projet1/x64/Release/DetecteurPeau.obj
	Sources/C++/Projet1/Projet1/x64/Release/Essais.obj
	Sources/C++/Projet1/Projet1/x64/Release/Projet1.tlog/cl.command.1.tlog
	Sources/C++/Projet1/Projet1/x64/Release/Projet1.tlog/cl.read.1.tlog
	Sources/C++/Projet1/Projet1/x64/Release/Projet1.tlog/cl.write.1.tlog
	Sources/C++/Projet1/Projet1/x64/Release/Projet1.tlog/link.command.1.tlog
	Sources/C++/Projet1/Projet1/x64/Release/Projet1.tlog/link.read.1.tlog
	Sources/C++/Projet1/Projet1/x64/Release/Projet1.tlog/link.write.1.tlog
	Sources/C++/Projet1/Projet1/x64/Release/Source.obj
	Sources/C++/Projet1/Projet1/x64/Release/vc120.pdb
	Sources/C++/Projet1/x64/Release/Projet1.exe
	Sources/C++/Projet1/x64/Release/Projet1.pdb
ValidationMAJ Apres Merge