just updating my code
Merge remote-tracking branch 'origin/master'

Conflicts:
	rw344/src/server/ClientThread.java
	change the else if dealing wit error 901