...
Merge branch 'master' of https://github.com/DionnV/BallZ2D

Conflicts:
	GDD_Game_Windows/GDD_Game_Windows.v11.suo
	GDD_Game_Windows/GDD_Game_Windows/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache