Merge point in progress
Merge branch 'AlgoTest' into develop

Conflicts:
	Mascotte/Mascotte.v11.suo
	Mascotte/Mascotte/bin/Debug/Mascotte.exe
	Mascotte/Mascotte/bin/Debug/Mascotte.exe.config
	Mascotte/Mascotte/bin/Debug/Mascotte.pdb
	Mascotte/Mascotte/bin/Debug/Mascotte.vshost.exe.config
	Mascotte/Mascotte/obj/Debug/App.g.i.cs
	Mascotte/Mascotte/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Mascotte/Mascotte/obj/Debug/MainWindow.g.i.cs
	Mascotte/Mascotte/obj/Debug/Mascotte.csproj.GenerateResource.Cache
	Mascotte/Mascotte/obj/Debug/Mascotte.csprojResolveAssemblyReference.cache
	Mascotte/Mascotte/obj/Debug/Mascotte.exe
	Mascotte/Mascotte/obj/Debug/Mascotte.pdb
	Mascotte/Mascotte/obj/Debug/Mascotte_MarkupCompile.cache
	Mascotte/Mascotte/obj/Debug/Mascotte_MarkupCompile.i.cache
	Mascotte/RobotControl/bin/Debug/RobotControl.exe
	Mascotte/RobotControl/bin/Debug/RobotControl.pdb
	Mascotte/RobotControl/bin/Debug/be/RobotControl.exe
	Mascotte/RobotControl/bin/Debug/be/RobotControl.pdb
	Mascotte/RobotControl/bin/Debug/be/RobotControl.pdbx
	Mascotte/RobotControl/bin/Debug/be/RobotControl.pe
	Mascotte/RobotControl/bin/Debug/le/RobotControl.exe
	Mascotte/RobotControl/bin/Debug/le/RobotControl.pdb
	Mascotte/RobotControl/bin/Debug/le/RobotControl.pdbx
	Mascotte/RobotControl/bin/Debug/le/RobotControl.pe
	Mascotte/RobotControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Mascotte/RobotControl/obj/Debug/RobotControl.csproj.FileListAbsolute.txt
	Mascotte/RobotControl/obj/Debug/RobotControl.csprojResolveAssemblyReference.cache
	Mascotte/RobotControl/obj/Debug/RobotControl.exe
	Mascotte/RobotControl/obj/Debug/RobotControl.pdb
	Mascotte/RobotControl/obj/Debug/TinyCLR_DebugReferences.cache
	Mascotte/RobotControl/obj/Debug/be/RobotControl.pdbx
	Mascotte/RobotControl/obj/Debug/be/RobotControl.pe
	Mascotte/RobotControl/obj/Debug/le/RobotControl.pdbx
	Mascotte/RobotControl/obj/Debug/le/RobotControl.pe
Merge branch 'MarginError' into develop

Conflicts:
	Mascotte/RobotControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Mascotte/RobotControl/obj/Debug/TinyCLR_DebugReferences.cache
	Mascotte/Tests/GeneralMapTests.cs
Merge Done