Problems with loading solution
problem loading solution
Merge branch 'Lezar3' of https://github.com/rajchow/InSys into Lezar3

Conflicts:
	InventoryManagement/Debug/InventoryManagement.exe
	InventoryManagement/Debug/InventoryManagement.pdb
	InventoryManagement/Debug/TestInventory.dll
	InventoryManagement/Debug/TestInventory.exp
	InventoryManagement/Debug/TestInventory.ilk
	InventoryManagement/Debug/TestInventory.lib
	InventoryManagement/Debug/TestInventory.pdb
	InventoryManagement/Debug/textFiles/invoice.txt
	InventoryManagement/InventoryManagement.sdf
	InventoryManagement/InventoryManagement.v11.suo
	InventoryManagement/InventoryManagement/Debug/CL.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/CL.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/Category.obj
	InventoryManagement/InventoryManagement/Debug/InventoryManagement.Build.CppClean.log
	InventoryManagement/InventoryManagement/Debug/InventoryManagement.lastbuildstate
	InventoryManagement/InventoryManagement/Debug/InventoryManagement.log
	InventoryManagement/InventoryManagement/Debug/InventoryManagement.vcxproj.GenerateResource.Cache
	InventoryManagement/InventoryManagement/Debug/InventoryManagement.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/Invoice.obj
	InventoryManagement/InventoryManagement/Debug/MyForm.obj
	InventoryManagement/InventoryManagement/Debug/Product.obj
	InventoryManagement/InventoryManagement/Debug/cl.command.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10056-cvtres.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10056-cvtres.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10056-rc.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10056-rc.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10056.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10056.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10148-cvtres.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10148-cvtres.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10148-rc.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10148-rc.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10148.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10148.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10268-cvtres.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10268-cvtres.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10268-rc.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10268-rc.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10268.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10268.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10328-cvtres.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10328-cvtres.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10328-rc.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10328-rc.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10328.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10328.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10388-cvtres.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10388-cvtres.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10388-rc.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10388-rc.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10388.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10388.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10412-cvtres.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10412-cvtres.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10412-rc.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10412-rc.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10412.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10412.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10424-cvtres.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10424-cvtres.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10424-rc.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10424-rc.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10424.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10424.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10440-cvtres.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10440-cvtres.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10440-rc.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10440-rc.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10440.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10440.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10444-cvtres.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10444-cvtres.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10444-rc.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10444-rc.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10444.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10444.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10520-cvtres.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10520-cvtres.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10520-rc.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10520-rc.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10520.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10520.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10604-cvtres.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10604-cvtres.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10604-rc.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10604-rc.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10604.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10604.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10752-cvtres.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10752-cvtres.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10752-rc.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10752-rc.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10752.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10752.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10772-cvtres.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10772-cvtres.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10772-rc.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10772-rc.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10772.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10772.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10876-cvtres.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10876-cvtres.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10876-rc.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10876-rc.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10876.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10876.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10888-cvtres.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10888-cvtres.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10888-rc.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10888-rc.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10888.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10888.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10972-cvtres.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10972-cvtres.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10972-rc.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10972-rc.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10972.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.10972.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.1956-cvtres.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.1956-cvtres.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.1956-rc.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.1956-rc.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.1956.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.1956.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.7576-cvtres.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.7576-cvtres.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.7576-rc.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.7576-rc.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.7576.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.7576.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.command.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.read.1.tlog
	InventoryManagement/InventoryManagement/Debug/link.write.1.tlog
	InventoryManagement/InventoryManagement/Debug/vc110.idb
	InventoryManagement/InventoryManagement/Debug/vc110.pdb
	InventoryManagement/InventoryManagement/Invoice.cpp
	InventoryManagement/InventoryManagement/Invoice.h
	InventoryManagement/TestInventory/Debug/CL.read.1.tlog
	InventoryManagement/TestInventory/Debug/CL.write.1.tlog
	InventoryManagement/TestInventory/Debug/TestInventory.lastbuildstate
	InventoryManagement/TestInventory/Debug/TestInventory.log
	InventoryManagement/TestInventory/Debug/TestInventory.pch
	InventoryManagement/TestInventory/Debug/TestInventory.write.1.tlog
	InventoryManagement/TestInventory/Debug/TestInvoice.obj
	InventoryManagement/TestInventory/Debug/categoryTests.obj
	InventoryManagement/TestInventory/Debug/cl.command.1.tlog
	InventoryManagement/TestInventory/Debug/link.command.1.tlog
	InventoryManagement/TestInventory/Debug/link.read.1.tlog
	InventoryManagement/TestInventory/Debug/link.write.1.tlog
	InventoryManagement/TestInventory/Debug/productTests.obj
	InventoryManagement/TestInventory/Debug/stdafx.obj
	InventoryManagement/TestInventory/Debug/vc110.idb
	InventoryManagement/TestInventory/Debug/vc110.pdb
	InventoryManagement/TestInventory/TestInvoice.cpp
	InventoryManagement/TestResults/InventoryManagement.TE.Tests.mdf
	InventoryManagement/TestResults/InventoryManagement.TE.Tests_log.ldf