sync it up
weird

Conflicts:
	Camp-Fire-Journeys-csharp.sln
	Camp-Fire-Journeys.sln
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/6e/6e02a5a41896f4eb38f3ff2845818c58
	Library/metadata/dd/ddc4e1ee4f8514ec89d1f88c8aa3da73