Trololo

yes
Merge branch 'master' of https://github.com/A307/BiddingAgent

Conflicts:
	BiddingAgent/App.config
	BiddingAgent/Properties/Settings.Designer.cs
	BiddingAgent/Properties/Settings.settings
	BiddingAgent/bin/Debug/BiddingAgent.exe.config
	BiddingAgent/bin/Debug/BiddingAgent.vshost.exe.config
Merge branch 'master' of https://github.com/A307/BiddingAgent

Conflicts:
	BiddingAgent/App.config
	BiddingAgent/Properties/Settings.Designer.cs
	BiddingAgent/Properties/Settings.settings
	BiddingAgent/bin/Debug/BiddingAgent.exe.config
	BiddingAgent/bin/Debug/BiddingAgent.vshost.exe.config