dock0.001

First stumbling steps on docking
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Prefabs/asteroid_m.prefab.meta
	Assets/Prefabs/asteroid_s.prefab.meta
	Assets/Scripts/ShipController.cs
Merge branch 'master' of https://github.com/LatexBotox/SPACE

Conflicts:
	Assets/Prefabs/asteroid_m.prefab.meta
	Assets/Prefabs/asteroid_s.prefab.meta
	Assets/Scripts/ShipController.cs
Huehuehue