no message
Merge branch 'master' of https://github.com/J-vandenBerg/GD_Development

Conflicts:
	Project GD/GameJam1/GameJam1.csproj
	Project GD/GameJam1/bin/Windows/Debug/SharpDX.DXGI.xml
	Project GD/GameJam1/bin/Windows/Debug/SharpDX.Direct2D1.xml
	Project GD/GameJam1/bin/Windows/Debug/SharpDX.Direct3D11.xml
	Project GD/GameJam1/bin/Windows/Debug/SharpDX.Direct3D9.xml
	Project GD/GameJam1/bin/Windows/Debug/SharpDX.MediaFoundation.xml
	Project GD/GameJam1/bin/Windows/Debug/SharpDX.XAudio2.xml
	Project GD/GameJam1/bin/Windows/Debug/SharpDX.xml
	Project GD/GameJam1/obj/x86/Debug/GameJam1.csproj.FileListAbsolute.txt
	Project GD/GameManagment/GameManagement.csproj
	Project GD/GameManagment/bin/Windows/Debug/SharpDX.DXGI.xml
	Project GD/GameManagment/bin/Windows/Debug/SharpDX.Direct2D1.xml
	Project GD/GameManagment/bin/Windows/Debug/SharpDX.Direct3D11.xml
	Project GD/GameManagment/bin/Windows/Debug/SharpDX.Direct3D9.xml
	Project GD/GameManagment/bin/Windows/Debug/SharpDX.MediaFoundation.xml
	Project GD/GameManagment/bin/Windows/Debug/SharpDX.XAudio2.xml
	Project GD/GameManagment/bin/Windows/Debug/SharpDX.xml
	Project GD/GameManagment/obj/x86/Debug/GameManagement.csproj.FileListAbsolute.txt