4
Merge branch 'ClientSide' of https://github.com/themrkefir/pommes into ClientSide

Conflicts:
	Pommes_Messager/Pommes_Messager.v11.suo
	Pommes_Messager/Pommes_Messager/bin/Debug/Pommes_Messager.exe
	Pommes_Messager/Pommes_Messager/bin/Debug/Pommes_Messager.pdb

	Pommes_Messager/Pommes_Messager/obj/Debug/Pommes_Messager.csproj.GenerateResource.Cache
	Pommes_Messager/Pommes_Messager/obj/Debug/Pommes_Messager.exe
	Pommes_Messager/Pommes_Messager/obj/Debug/Pommes_Messager.pdb