qq
Merge branch 'master' of github.com:BurningMan/4sqChat

Conflicts:
	4sqChat/bin/4sqChat.dll