modified:   src/main/java/com/paris7/schat/client/Connection.java
	modified:   src/main/java/com/paris7/schat/client/Emission.java
	modified:   src/main/java/com/paris7/schat/client/Reception.java
	modified:   src/main/java/com/paris7/schat/client/SingleChat.java
	modified:   src/main/java/com/paris7/schat/client/UDPConnection.java
	modified:   src/main/java/model/Client.java
	modified:   src/main/java/model/ConnectedClients.java
Merge branch 'master' of https://github.com/ziellim/Schat

Conflicts:
	src/main/java/com/paris7/schat/client/TCPConnection.java
	src/main/java/model/ConnectedClients.java
	modified:   src/main/java/com/paris7/schat/client/TCPConnection.java
	modified:   src/main/java/com/paris7/schat/client/UDPConnection.java
	modified:   src/main/java/model/Client.java
	modified:   src/main/java/model/ClientList.java
	deleted:    src/main/java/model/ConnectedClients.java
	modified:   src/main/java/model/SuccessConnectionResponse.java