test
test
Merge branch 'master' of https://github.com/sqlhammer/CIS470-Devry-Senior-Project

Conflicts:
	WSC/WSC.v12.suo
	WSC/WSCUnitTests/bin/Debug/Business.dll
	WSC/WSCUnitTests/bin/Debug/Business.pdb
	WSC/WSCUnitTests/bin/Debug/Data.dll
	WSC/WSCUnitTests/bin/Debug/Data.pdb
	WSC/WSCUnitTests/bin/Debug/WSC.exe
	WSC/WSCUnitTests/bin/Debug/WSC.pdb
	WSC/WSCUnitTests/bin/Debug/WSCUnitTests.exe
	WSC/WSCUnitTests/bin/Debug/WSCUnitTests.pdb

	WSC/WSCUnitTests/obj/Debug/WSCUnitTests.csprojResolveAssemblyReference.cache
	WSC/WSCUnitTests/obj/Debug/WSCUnitTests.exe
	WSC/WSCUnitTests/obj/Debug/WSCUnitTests.pdb