Checkpoint.
Checkpoint.
Checkpoint.

Merge branch 'master' of https://github.com/Terrence-Bowen/Clearent

Conflicts:
	Projects/Calculator/Calculator/EquationManager_/EquationManager.cs
	Projects/Calculator/Calculator/EquationManager_/IEquationManager.cs
	Projects/Calculator/Calculator/bin/Debug/Calculator.exe
	Projects/Calculator/Calculator/bin/Debug/Calculator.pdb
	Projects/Calculator/Calculator/obj/Debug/Calculator.csproj.FileListAbsolute.txt
	Projects/Calculator/Calculator/obj/Debug/Calculator.csprojResolveAssemblyReference.cache
	Projects/Calculator/Calculator/obj/Debug/Calculator.exe
	Projects/Calculator/Calculator/obj/Debug/Calculator.pdb
	Projects/Calculator/TestResults/Calculator.TE.Tests.mdf
	Projects/Calculator/TestResults/Calculator.TE.Tests_log.ldf
	Projects/Calculator/UnitTestProject/EquationManager_UT_/EquationManager_UT.cs
	Projects/Calculator/UnitTestProject/bin/Debug/Calculator.exe
	Projects/Calculator/UnitTestProject/bin/Debug/Calculator.pdb
	Projects/Calculator/UnitTestProject/bin/Debug/UnitTestProject.dll
	Projects/Calculator/UnitTestProject/bin/Debug/UnitTestProject.pdb
	Projects/Calculator/UnitTestProject/obj/Debug/UnitTestProject.csproj.FileListAbsolute.txt
	Projects/Calculator/UnitTestProject/obj/Debug/UnitTestProject.csprojResolveAssemblyReference.cache
	Projects/Calculator/UnitTestProject/obj/Debug/UnitTestProject.dll
	Projects/Calculator/UnitTestProject/obj/Debug/UnitTestProject.pdb
	Projects/Workflow/Workflow.v11.suo
	Projects/Workflow/Workflow/bin/Debug/Workflow.vshost.exe.manifest