Trying to merge
Merge remote-tracking branch 'spacegods/master'

Conflicts:
	Assets/Scripts/Move.cs.meta
	Assets/Scripts/Planet.cs.meta
Made planets collide with each other and Gods. Moved gravity to physics system. Renamed and reorganized files and stopped tracking Library folder.
Merge branch 'master' of https://github.com/buckslice/spacegods

Conflicts:
	Assets/Scripts/Move.cs
	Assets/Scripts/Planet.cs
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/metadata/0e/0e63adc77c0b0584f8fd49afd6c2ca6d
	Library/metadata/17/1726560a7d85c2b4e88bf28ea30de130
trying to merge here...