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

Conflicts:
	BiddingAgent/MainWindow.xaml.cs