Test simple part
Complet, Attention to Conflicts
Merge origin/master

Conflicts:
	src/IntervenantImpl.java
	src/IrcGui.java