3b
Merge branch 'master' of github.com:s850042002/OStock-Console

Conflicts:
	OStock Console.v11.suo
	OStock/bin/Debug/OStock Console.application
	OStock/bin/Debug/OStock Console.exe
	OStock/bin/Debug/OStock Console.exe.manifest
	OStock/bin/Debug/OStock Console.pdb
	OStock/bin/Debug/OStock Console.vshost.application
	OStock/bin/Debug/OStock Console.vshost.exe.manifest
	OStock/obj/x86/Debug/OStock Console.application
	OStock/obj/x86/Debug/OStock Console.csproj.GenerateResource.Cache
	OStock/obj/x86/Debug/OStock Console.exe
	OStock/obj/x86/Debug/OStock Console.exe.manifest
	OStock/obj/x86/Debug/OStock Console.pdb
4