1

1
Merge branch 'master' of https://github.com/innocentim/downbox

Conflicts:
	WinClient/Debug/WinClient.exe
	WinClient/Debug/WinClient.ilk
	WinClient/Debug/WinClient.pdb
	WinClient/WinClient.sdf
	WinClient/WinClient.v12.suo
	WinClient/WinClient/Debug/Source.obj
	WinClient/WinClient/Debug/WinClient.log
	WinClient/WinClient/Debug/WinClient.tlog/link.read.1.tlog
	WinClient/WinClient/Debug/vc120.idb
	WinClient/WinClient/Debug/vc120.pdb
	WinClient/WinClient/Source.cpp