Cleint Update

Still needs work
Merge branch 'master' of https://github.com/intimite/SocketsAreFun

Conflicts:
	PlayWithSockets/bin/Main.class
	PlayWithSockets/src/Main.java
	PlayWithSockets/src/client.java