dcd
Merge branch 'master' of https://github.com/Painfck/case4

Conflicts:
	MindSoft/obj/Debug/MindSoft.csproj.GenerateResource.Cache
	MindSoft/obj/Debug/MindSoft.csprojResolveAssemblyReference.cache