All kinds of stuffs
Merge branch 'master' of http://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.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