add socket line _ test commit
Merge remote-tracking branch 'origin/master'
test 2
Initial commit

(cherry picked from commit 714b575086380e93b123db3bed4e3f10c430d628)

Conflicts:
	.idea/vcs.xml
	server_simple.py

Add:
reg
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/vcs.xml
	server_simple.py