first commit
Merge branch 'master' of https://github.com/duli2888/company_testwork

Conflicts:
	socket/3rd/client
	socket/3rd/client.c