Merge branch 'master' of https://github.com/ausLancaster/Graphics-and-Interaction-Project2-Pigeon-Time

Conflicts:
Project1Game.cs
bin/Debug/Project1.Desktop.exe
bin/Debug/Project1.Desktop.pdb
obj/Debug/Content___Car.x.deps
obj/Debug/Content___Sphere.x.deps
obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
obj/Debug/Project1.Desktop.csproj.FileListAbsolute.txt
obj/Debug/Project1.Desktop.csprojResolveAssemblyReference.cache
obj/Debug/Project1.Desktop.exe
obj/Debug/Project1.Desktop.pdb
Merge branch 'master' of https://github.com/ausLancaster/Graphics-and-Interaction-Project2-Pigeon-Time

Conflicts:
	Project1Game.cs
	bin/Debug/Project1.Desktop.exe
	bin/Debug/Project1.Desktop.pdb
	obj/Debug/Content___Car.x.deps
	obj/Debug/Content___Sphere.x.deps
	obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	obj/Debug/Project1.Desktop.csproj.FileListAbsolute.txt
	obj/Debug/Project1.Desktop.csprojResolveAssemblyReference.cache
	obj/Debug/Project1.Desktop.exe
	obj/Debug/Project1.Desktop.pdb