modified:   src/main/java/com/paris7/schat/client/ClientMain.java
	modified:   src/main/java/com/paris7/schat/client/UDPConnection.java
Merge branch 'master' of https://github.com/ziellim/Schat
Merge branch 'master' of https://github.com/ziellim/Schat