Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	SpaceParasiteRunnerGame/Assets/Prefabs/ShipPrefab.prefab
	SpaceParasiteRunnerGame/Assets/Scenes/TrackConstruction.unity
	SpaceParasiteRunnerGame/Library/assetDatabase3
	SpaceParasiteRunnerGame/Library/guidmapper

	SpaceParasiteRunnerGame/Library/metadata/a5/a52eb41cac37c1a4c86ca868828b123b

	SpaceParasiteRunnerGame/Library/metadata/cb/cb4c94e0276274a4c95dbceea86ec18f