modified:   src/main/java/com/paris7/schat/client/Connection.java
	modified:   src/main/java/com/paris7/schat/server/Connection.java
	modified:   src/main/java/model/Client.java
	modified:   src/main/java/model/Request.java
	deleted:    src/test/java/com/paris7/schat/AppTest.java
	modified:   src/main/java/com/paris7/schat/client/Connection.java
	modified:   src/main/java/com/paris7/schat/server/Connection.java
	modified:   src/main/java/model/Client.java
	new file:   src/main/java/model/Clients.java
	modified:   src/main/java/model/Request.java
	modified:   src/main/java/model/Server.java
	new file:   src/main/java/model/ValidResponse.java
Merge branch 'master' of https://github.com/ziellim/Schat

Conflicts:
	src/main/java/com/paris7/schat/client/Connection.java
	src/main/java/com/paris7/schat/server/Connection.java
	src/main/java/model/Client.java
	src/main/java/model/Request.java
	modified:   src/main/java/com/paris7/schat/client/Connection.java
	modified:   src/main/java/com/paris7/schat/server/Connection.java
	modified:   src/main/java/model/Client.java
	modified:   src/main/java/model/Clients.java
	modified:   src/main/java/model/Request.java