reset
Merge remote-tracking branch 'origin/master'

Conflicts:
	Test/bin/ClientGUI.class
	Test/src/ClientGUI.java
	Test1/bin/ChatServer.class
	Test1/src/ChatServer.java
check