Client ok
Merge branch 'master' of
https://github.com/PlatinumJesus/chat-system.git

Conflicts:
	chat-system/src/Client.java