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

Conflicts:
	src/main/java/com/paris7/schat/client/UDPConnection.java
	modified:   .gitignore
	new file:   rapport/rapport.pdf
	new file:   rapport/rapport.tex
	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
Merge branch 'master' of https://github.com/ziellim/Messenger

Conflicts:
	src/main/java/com/paris7/schat/client/Emission.java
	src/main/java/com/paris7/schat/client/Reception.java
	src/main/java/com/paris7/schat/client/UDPConnection.java