Modified Ignore FIle
Merge branch 'Roger'

Conflicts:
	.gitignore
Test Build and Config
SUO FIle
Merge branch 'Roger'

Conflicts:
	ClassProject/ClassProject.v11.suo
	ClassProject/ClassProject/bin/ClassProject.dll
	ClassProject/ClassProject/bin/ClassProject.pdb
	ClassProject/ClassProject/bin/FCTDataModel.dll
	ClassProject/ClassProject/bin/FCTDataModel.pdb
	ClassProject/ClassProject/obj/Debug/ClassProject.csprojResolveAssemblyReference.cache
	ClassProject/ClassProject/obj/Debug/ClassProject.dll
	ClassProject/ClassProject/obj/Debug/ClassProject.pdb
	ClassProject/FCTDataTests/bin/Debug/FCTDataModel.dll
	ClassProject/FCTDataTests/bin/Debug/FCTDataModel.pdb
	ClassProject/FCTDataTests/bin/Debug/FCTDataTests.dll
	ClassProject/FCTDataTests/bin/Debug/FCTDataTests.pdb
	ClassProject/FCTDataTests/obj/Debug/FCTDataTests.csprojResolveAssemblyReference.cache
	ClassProject/FCTDataTests/obj/Debug/FCTDataTests.dll
	ClassProject/FCTDataTests/obj/Debug/FCTDataTests.pdb
Merge branch 'Roger'

Conflicts:
	.gitignore
Merge branch 'Roger'
Merge branch 'Roger'
Name adjustments
Merge branch 'master' into Roger