First commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Client/ChatClient.java
	src/main.java
First commit