User avec mise à jour de la base de donnée
Merge branch 'master' of https://github.com/XavierMalleville/IRC-EBENXMAL.git
Tout
Merge branch 'master' of
https://github.com/XavierMalleville/IRC-EBENXMAL.git

Conflicts:
	ClientServeurIRC/.classpath
Merge branch 'master' of https://github.com/XavierMalleville/IRC-EBENXMAL.git
Merge Xavir/Eric