Merge branch 'master' of https://github.com/qtdwzAdam/serverJob

Conflicts:
	SocketServer.h
Merge branch 'master' of https://github.com/qtdwzAdam/serverJob