Merge branch 'master' of C:\Users\DiDi\workspace\chat_application with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/client/model/ClientManager.java
	src/client/view/ClientFrame.java
	src/server/view/ServerFrame.java
Remise en forme