resetted commit
Merge branch 'master' of https://github.com/rvnijnatten/De-Fles

Conflicts:
	DeFles/DeFles.v11.suo
	DeFles/DeFles/GameLogic.cs
	DeFles/DeFles/bin/Debug/DeFles.exe
	DeFles/DeFles/bin/Debug/DeFles.pdb
	DeFles/DeFles/obj/Debug/DeFles.csproj.GenerateResource.Cache
	DeFles/DeFles/obj/Debug/DeFles.csprojResolveAssemblyReference.cache
	DeFles/DeFles/obj/Debug/DeFles.exe
	DeFles/DeFles/obj/Debug/DeFles.pdb
	DeFles/Server/bin/Debug/Server.exe
	DeFles/Server/bin/Debug/Server.pdb
	DeFles/Server/obj/Debug/Server.exe
	DeFles/Server/obj/Debug/Server.pdb