zzz

zzz
Merge branch 'master' of https://github.com/sy1989/steambotcardtrade

Conflicts:
	.gitignore
	Bin/Debug/Newtonsoft.Json.dll
	Bin/Debug/Newtonsoft.Json.pdb
	Bin/Debug/Newtonsoft.Json.xml
	Bin/Debug/SteamBot.exe
	Bin/Debug/SteamBot.pdb
	Bin/Debug/SteamBot.vshost.exe
	Bin/Debug/SteamKit2.dll
	Bin/Debug/SteamKit2.pdb
	Bin/Debug/SteamKit2.xml
	Bin/Debug/SteamTrade.dll
	Bin/Debug/SteamTrade.pdb
	Bin/Debug/protobuf-net.dll
	Bin/Debug/protobuf-net.pdb
	Bin/Debug/protobuf-net.xml
	SteamBot.sln
	SteamBot/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	SteamBot/obj/x86/Debug/ExampleBot.csproj.FileListAbsolute.txt
	SteamBot/obj/x86/Debug/SteamBot.exe
	SteamTrade/Inventory.cs
	SteamTrade/bin/Debug/Newtonsoft.Json.dll
	SteamTrade/bin/Debug/Newtonsoft.Json.pdb
	SteamTrade/bin/Debug/Newtonsoft.Json.xml
	SteamTrade/bin/Debug/SteamKit2.dll
	SteamTrade/bin/Debug/SteamKit2.pdb
	SteamTrade/bin/Debug/SteamKit2.xml
	SteamTrade/bin/Debug/SteamTrade.dll
	SteamTrade/bin/Debug/SteamTrade.pdb
	SteamTrade/bin/Debug/protobuf-net.dll
	SteamTrade/bin/Debug/protobuf-net.pdb
	SteamTrade/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	SteamTrade/obj/Debug/SteamTrade.csproj.FileListAbsolute.txt
	SteamTrade/obj/Debug/SteamTrade.dll
	SteamTrade/obj/Debug/SteamTrade.pdb