Merge branch 'master' of https://github.com/xuzhezhaozhao/TopCoder

Conflicts:
	CaptureThemAll/CaptureThemAll.sln.docstates.suo
	CaptureThemAll/CaptureThemAll.suo
Merge branch 'master' of https://github.com/xuzhezhaozhao/TopCoder

Conflicts:
	CaptureThemAll/CaptureThemAll.sln.docstates.suo
	CaptureThemAll/CaptureThemAll.suo