Changed absolutely everything
Merge branch 'master' of https://github.com/Crumpets-In-Space/Asteroid-Tycoon

Conflicts:
	New Unity Project/Assembly-CSharp.pidb
	New Unity Project/Library/AssetServerCacheV3
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	New Unity Project/Library/assetDatabase3
	New Unity Project/Library/guidmapper
	New Unity Project/Library/metadata/3a/3a4e6122a54bf4f428c2c092a99980c3
	New Unity Project/Library/metadata/c1/c1617fb793eba4449bb646f4ec765512
	New Unity Project/Library/metadata/fb/fbdde42f9aefabe4781faaede0562feb
	New Unity Project/New Unity Project-csharp.sln
	New Unity Project/New Unity Project.sln
	New Unity Project/New Unity Project.userprefs