self ip address to string
fixed merging issues
Merge branch 'master' of github.com:chueyee2007/network

Conflicts:
	client/client
	client/client.cpp