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

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

Conflicts:
	GDD_Game_Windows/GDD_Game_Windows.suo
	GDD_Game_Windows/GDD_Game_Windows/Form1.cs
	GDD_Game_Windows/GDD_Game_Windows/GDD_Library/GDD_CollisionInfo.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/GDD_Game_Windows.exe
	GDD_Game_Windows/GDD_Game_Windows/obj/x86/Debug/GDD_Game_Windows.pdb
Rolling on the river
Merge branch 'master' of https://github.com/DionnV/BallZ2D

Conflicts:
	GDD_Game_Windows/GDD_Game_Windows/Form1.cs
	GDD_Game_Windows/GDD_Game_Windows/GDD_Library/GDD_View.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.exe
	GDD_Game_Windows/GDD_Game_Windows/obj/x86/Debug/GDD_Game_Windows.pdb
Zal wel
Merge branch 'master' of https://github.com/DionnV/BallZ2D

Conflicts:
	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.exe
	GDD_Game_Windows/GDD_Game_Windows/obj/x86/Debug/GDD_Game_Windows.pdb
Merge branch 'master' of https://github.com/DionnV/BallZ2D

Conflicts:
	GDD_Game_Windows/GDD_Game_Windows.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.exe
	GDD_Game_Windows/GDD_Game_Windows/obj/x86/Debug/GDD_Game_Windows.pdb
Built