Thing fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Props/ring.fbx.meta