BLERGH
Merge branch 'master' of https://github.com/JayArmstrongGames/Camp-Fire-Journeys

Conflicts:
	Assembly-CSharp-Editor.csproj
	Assembly-CSharp.csproj
	Assets/AddOns/JMO Assets/Cartoon FX Easy Editor/CartoonFX Easy Editor
Readme.txt.meta
	Camp-Fire-Journeys-csharp.sln
	Camp-Fire-Journeys.sln
	Library/CurrentLayout.dwlt
	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/ScriptMapper
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/00/00000000000000009000000000000000
	Library/metadata/00/0000000000000000c000000000000000
	Library/metadata/01/014a06318f71c4563b577bb8c3741a21
	Library/metadata/0e/0e1203edacc9eeb4b82fbc631dd4bdf7
	Library/metadata/21/21768c9bb8f895f499a017c4b2ce392c
	Library/metadata/22/225eed14b97254cc8a6ff6749817ac7a
	Library/metadata/26/26c7d0e88692940b2a0c12ac04a2596f
	Library/metadata/33/33e6621d2756c044d88f4f9de1a55e7e
	Library/metadata/64/645a11d137d568d4bb4e5e97f259a333
	Library/metadata/71/71c1c2c44325b4940ad94404f21c8aac
	Library/metadata/7e/7e97ba541c04449489e6aaec1539d526
	Library/metadata/7f/7fcebc96ba98b634d9ec1875fcc8390f
	Library/metadata/c9/c9de9ea42cb144904b84cf0655c87f3f
	Library/metadata/cd/cd0e4347930affd4f81cb4698d17c2ca
	Library/metadata/e6/e6d1dbabd3135d546b6c48db6a6879f3
	Library/metadata/e7/e7c12f66fc800c542b10e36383a4613e
	ProjectSettings/QualitySettings.asset