Merge remote-tracking branch 'upstream/master' into cloning

Conflicts:
	Assets/Scripts/Player/Player.cs
ship prefab
Merge branch 'cloning' of https://github.com/ckhamash/SpaceTwitch

Conflicts:
	Assets/Resources/Prefabs/Player/Ship.prefab
	Assets/Scripts/Player/Player.cs