ça avance
pfiou enfin merged
Merge branch 'master' of github.com:zanettibo/IRC

Conflicts:
	ChatClient/App.config
	ChatClient/ChatClient.csproj
	ChatClient/Program.cs
	ChatClient/Properties/AssemblyInfo.cs
	ChatClient/Properties/Resources.Designer.cs
	ChatClient/Properties/Resources.resx
	ChatClient/Properties/Settings.Designer.cs
	ChatClient/Properties/Settings.settings
	ChatServer/User.cs