Slight Test scene changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	SpaceParasiteRunnerGame/Library/CurrentLayout.dwlt
	SpaceParasiteRunnerGame/Library/assetDatabase3
	SpaceParasiteRunnerGame/Library/guidmapper

	SpaceParasiteRunnerGame/Library/metadata/87/87d5312e6ab2f33468c57c51b1056adb

	SpaceParasiteRunnerGame/Library/metadata/9b/9b7c1b6bad3425a4784523a830ee9745
Merge branch 'master' of https://github.com/luchoscar/SpaceParasiteRunner

Conflicts:
	SpaceParasiteRunnerGame/Library/CurrentLayout.dwlt
	SpaceParasiteRunnerGame/Library/assetDatabase3
	SpaceParasiteRunnerGame/Library/guidmapper

	SpaceParasiteRunnerGame/Library/metadata/87/87d5312e6ab2f33468c57c51b1056adb

	SpaceParasiteRunnerGame/Library/metadata/9b/9b7c1b6bad3425a4784523a830ee9745
Aaron Update #2

needs ship functions fully flushed out
butts

i hope this works
Merge remote-tracking branch 'origin/master'

Conflicts:
	SpaceParasiteRunnerGame/Assets/Scripts/LevelGenerator/LevelGenerator.cs
	SpaceParasiteRunnerGame/Assets/Scripts/LevelGenerator/TrackSegment.cs
	SpaceParasiteRunnerGame/Library/CurrentLayout.dwlt
	SpaceParasiteRunnerGame/Library/InspectorExpandedItems.asset
	SpaceParasiteRunnerGame/Library/ScriptAssemblies/Assembly-CSharp.dll

	SpaceParasiteRunnerGame/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	SpaceParasiteRunnerGame/Library/assetDatabase3
	SpaceParasiteRunnerGame/Library/guidmapper

	SpaceParasiteRunnerGame/Library/metadata/0c/0c8486f64f12c4b4088f9ca8c52da253

	SpaceParasiteRunnerGame/Library/metadata/44/44f2a9f9dbfc97245ab7874918875139

	SpaceParasiteRunnerGame/Library/metadata/4e/4e3d27e3153699b468c91d327eb8e80e

	SpaceParasiteRunnerGame/Library/metadata/60/6024069cb13455e4cbc6b93fa51aa367

	SpaceParasiteRunnerGame/Library/metadata/65/65180a85017562941b70aa3bf8567846

	SpaceParasiteRunnerGame/Library/metadata/87/87d5312e6ab2f33468c57c51b1056adb

	SpaceParasiteRunnerGame/Library/metadata/9b/9b7c1b6bad3425a4784523a830ee9745

	SpaceParasiteRunnerGame/Library/metadata/a8/a815e4388041fb5439e3e8cec64219c0

	SpaceParasiteRunnerGame/Library/metadata/ae/ae1a21eb4c6e3fe43bdb0f9ef3864451

	SpaceParasiteRunnerGame/Library/metadata/f1/f11d5763f34be2a41a55d3e139ddad82

	SpaceParasiteRunnerGame/Library/metadata/fe/fe3cbbdbfce63584393f467de3d48dec
njh

uyiy
Merge remote-tracking branch 'origin/master'

Conflicts:
	SpaceParasiteRunnerGame/Assets/Scripts/LevelGenerator/LevelGenerator.cs
	SpaceParasiteRunnerGame/Assets/Scripts/LevelGenerator/TrackSegment.cs
	SpaceParasiteRunnerGame/Library/CurrentLayout.dwlt
	SpaceParasiteRunnerGame/Library/InspectorExpandedItems.asset
	SpaceParasiteRunnerGame/Library/ScriptAssemblies/Assembly-CSharp.dll

	SpaceParasiteRunnerGame/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	SpaceParasiteRunnerGame/Library/assetDatabase3
	SpaceParasiteRunnerGame/Library/guidmapper

	SpaceParasiteRunnerGame/Library/metadata/0c/0c8486f64f12c4b4088f9ca8c52da253

	SpaceParasiteRunnerGame/Library/metadata/44/44f2a9f9dbfc97245ab7874918875139

	SpaceParasiteRunnerGame/Library/metadata/4e/4e3d27e3153699b468c91d327eb8e80e

	SpaceParasiteRunnerGame/Library/metadata/60/6024069cb13455e4cbc6b93fa51aa367

	SpaceParasiteRunnerGame/Library/metadata/65/65180a85017562941b70aa3bf8567846

	SpaceParasiteRunnerGame/Library/metadata/87/87d5312e6ab2f33468c57c51b1056adb

	SpaceParasiteRunnerGame/Library/metadata/9b/9b7c1b6bad3425a4784523a830ee9745

	SpaceParasiteRunnerGame/Library/metadata/a8/a815e4388041fb5439e3e8cec64219c0

	SpaceParasiteRunnerGame/Library/metadata/ae/ae1a21eb4c6e3fe43bdb0f9ef3864451

	SpaceParasiteRunnerGame/Library/metadata/f1/f11d5763f34be2a41a55d3e139ddad82

	SpaceParasiteRunnerGame/Library/metadata/fe/fe3cbbdbfce63584393f467de3d48dec