asd
Merge branch 'master' of github.com:hanmanhui/SteamCrawler

Conflicts:
	CurlConnector.cpp
Modulized