added stuff
Merge branch 'master' of https://github.com/starr749/socket_test

Conflicts:
	socketserver/SocketHandler.java
completed example