test remove
Merge branch 'master' of https://github.com/bluesummer/demo

Conflicts:
	SOCKET AND IPAPP/Ipapp.cpp