osef
switch branch
interface mid, bas
interface bottom
suo sdf
Merge branch 'master' of https://github.com/Aceltis/ProjetPoo

Conflicts:
	Civilization/Civilization.sdf
	Civilization/Civilization.suo
	Civilization/CivilizationAlgo/Release/CL.read.1.tlog
	Civilization/CivilizationAlgo/Release/CL.write.1.tlog
	Civilization/CivilizationAlgo/Release/CivilizationAlgo.log
	Civilization/CivilizationAlgo/Release/CivilizationAlgo.vcxprojResolveAssemblyReference.cache
	Civilization/CivilizationAlgo/Release/CivilizationAlgo.write.1.tlog
	Civilization/CivilizationAlgo/Release/Lib-link.read.1.tlog
	Civilization/CivilizationAlgo/Release/Lib-link.write.1.tlog
	Civilization/CivilizationAlgo/Release/cl.command.1.tlog
	Civilization/CivilizationAlgo/Release/lib.command.1.tlog
	Civilization/CivilizationAlgo/Release/mapalgo.obj
	Civilization/CivilizationAlgo/Release/vc100.pdb
	Civilization/CivilizationLib/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
	Civilization/CivilizationWPF/MainWindow.xaml
	Civilization/CivilizationWPF/bin/Release/CivilizationWPF.exe
	Civilization/CivilizationWPF/bin/Release/CivilizationWPF.pdb
	Civilization/CivilizationWPF/bin/Release/CivilizationWrapper.dll
	Civilization/CivilizationWPF/bin/Release/CivilizationWrapper.pdb
	Civilization/CivilizationWPF/obj/x86/Release/CivilizationWPF.csproj.GenerateResource.Cache
	Civilization/CivilizationWPF/obj/x86/Release/CivilizationWPF.csprojResolveAssemblyReference.cache
	Civilization/CivilizationWPF/obj/x86/Release/CivilizationWPF.exe
	Civilization/CivilizationWPF/obj/x86/Release/CivilizationWPF.g.resources
	Civilization/CivilizationWPF/obj/x86/Release/CivilizationWPF.pdb
	Civilization/CivilizationWPF/obj/x86/Release/CivilizationWPF_Content.g.i.cs
	Civilization/CivilizationWPF/obj/x86/Release/CivilizationWPF_MarkupCompile.cache
	Civilization/CivilizationWPF/obj/x86/Release/DesignTimeResolveAssemblyReferences.cache
	Civilization/CivilizationWPF/obj/x86/Release/MainWindow.baml
	Civilization/CivilizationWPF/obj/x86/Release/MainWindow.g.cs
	Civilization/CivilizationWPF/obj/x86/Release/MainWindow.g.i.cs
	Civilization/CivilizationWrapper/Release/.NETFramework,Version=v4.0.AssemblyAttributes.obj
	Civilization/CivilizationWrapper/Release/CL.read.1.tlog
	Civilization/CivilizationWrapper/Release/CL.write.1.tlog
	Civilization/CivilizationWrapper/Release/CivilizationWrapper.log
	Civilization/CivilizationWrapper/Release/Wrapper.obj
	Civilization/CivilizationWrapper/Release/cl.command.1.tlog
	Civilization/CivilizationWrapper/Release/link.command.1.tlog
	Civilization/CivilizationWrapper/Release/link.read.1.tlog
	Civilization/CivilizationWrapper/Release/link.write.1.tlog
	Civilization/CivilizationWrapper/Release/mt.command.1.tlog
	Civilization/CivilizationWrapper/Release/mt.read.1.tlog
	Civilization/CivilizationWrapper/Release/mt.write.1.tlog
	Civilization/CivilizationWrapper/Release/vc100.pdb
	Civilization/Release/CivilizationAlgo.lib
	Civilization/Release/CivilizationWrapper.dll
	Civilization/Release/CivilizationWrapper.pdb