kk
Merge branch 'master' of https://github.com/artiespeedy/Solar-Centrifuge

Conflicts:
	Assets/Scenes/Main.unity
	Library/assetDatabase3
	Library/guidmapper