Signed-off-by: ritacc <ritacc@126.com>
Merge branch 'master' of github.com:ritacc/QueueClient

Conflicts:
	QSoft/MainWindow.xaml
	QSoft/MainWindow.xaml.cs

Signed-off-by: ritacc <ritacc@126.com>