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

Conflicts:
	GDD_Game_Windows/GDD_Game_Windows.v11.suo
	GDD_Game_Windows/GDD_Game_Windows/FormMain.Designer.cs
	GDD_Game_Windows/GDD_Game_Windows/FormMain.cs
	GDD_Game_Windows/GDD_Game_Windows/LevelDesigner.cs
	GDD_Game_Windows/GDD_Game_Windows/Program.cs
	GDD_Game_Windows/GDD_Game_Windows/bin/Debug/GDD_Game_Windows.exe
	GDD_Game_Windows/GDD_Game_Windows/bin/Debug/GDD_Game_Windows.pdb
	GDD_Game_Windows/GDD_Game_Windows/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
	GDD_Game_Windows/GDD_Game_Windows/obj/x86/Debug/GDD_Game_Windows.csproj.GenerateResource.Cache
	GDD_Game_Windows/GDD_Game_Windows/obj/x86/Debug/GDD_Game_Windows.exe
	GDD_Game_Windows/GDD_Game_Windows/obj/x86/Debug/GDD_Game_Windows.pdb
Merging
...
Merge branch 'master' of https://github.com/DionnV/BallZ2D

Conflicts:
	GDD_Game_Windows/GDD_Game_Windows.v11.suo
	GDD_Game_Windows/GDD_Game_Windows/bin/Debug/GDD_Game_Windows.exe
	GDD_Game_Windows/GDD_Game_Windows/bin/Debug/GDD_Game_Windows.pdb
	GDD_Game_Windows/GDD_Game_Windows/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
	GDD_Game_Windows/GDD_Game_Windows/obj/x86/Debug/GDD_Game_Windows.csproj.GenerateResource.Cache
	GDD_Game_Windows/GDD_Game_Windows/obj/x86/Debug/GDD_Game_Windows.exe
	GDD_Game_Windows/GDD_Game_Windows/obj/x86/Debug/GDD_Game_Windows.pdb
Dat Leveldesigner.