New Master
Merge branch 'master' of https://github.com/lhendrey/GDIGameEngine

Conflicts:
	GDIGame/bin/Debug/GDIGame.exe
	GDIGame/bin/Debug/GDIGame.pdb
	GDIGame/obj/Debug/GDIGame.csprojResolveAssemblyReference.cache
	GDIGame/obj/Debug/GDIGame.exe
	GDIGame/obj/Debug/GDIGame.pdb