up
Merge branch 'master' of https://github.com/adrienrouquet/cpe-projet.git

Conflicts:
	WebContent/content/chat/contactWindow.jsp
	src/ServerCore/ChatServlet.java