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

Conflicts:
	Assembly-CSharp-Editor-vs.csproj
	Assembly-CSharp-Editor.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Camp-Fire-Journeys-csharp.sln
	Camp-Fire-Journeys.sln
	Library/CurrentMaximizeLayout.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/assetDatabase3
	Library/metadata/6e/6e02a5a41896f4eb38f3ff2845818c58
	Temp/UnityTempFile-107a1ebd573f64b5e855995e0812d1e1
	Temp/UnityTempFile-14080cfe76a7a4c5f987d777341434ee
	Temp/UnityTempFile-14f510cbb32924f8b9a57c087acd30d1
	Temp/UnityTempFile-21170c9a135cd4cedadd0071672bd649
	Temp/UnityTempFile-21964c8dd8fb44b7a8563a454578353f
	Temp/UnityTempFile-2e8626587db2b401bbd2194058c98a2f
	Temp/UnityTempFile-47d4f06d7149844deb96e2368babb363
	Temp/UnityTempFile-485b2d70461d74a479396e9f17548017
	Temp/UnityTempFile-54952a3020c274a158fe30d1fd1f5f5c
	Temp/UnityTempFile-5ca4fe0b578ae4e849343e28d261c1a2
	Temp/UnityTempFile-611b22001b7f746e4b77b56807d742c0
	Temp/UnityTempFile-6b917205ed6234a97b532f3c098869d3
	Temp/UnityTempFile-71749935df7d144b8b733a38d01261be
	Temp/UnityTempFile-759f81455d1c44f3baca61a563aae401
	Temp/UnityTempFile-813f038b893154c84928774c1fd25aee
	Temp/UnityTempFile-8a5b7725cb9f44f1ba7ff703b143ad19
	Temp/UnityTempFile-9d760b892cf4749a990c0e3eea30a26d
	Temp/UnityTempFile-a10b1ad2469a84441a9e0075a8e7ddad
	Temp/UnityTempFile-aca1b11e432674a4c9854dd26f320cb6
	Temp/UnityTempFile-b233b9475a0464ed8b19967539a90bc9
	Temp/UnityTempFile-b2bfa44ec401b49f09935e9a71ae01f2
	Temp/UnityTempFile-b7107744bbb4c42698749052f9f0e0b1
	Temp/UnityTempFile-bf05334d12dae4eac8cbe56e81b7dca5
	Temp/UnityTempFile-c14569a02cc644968a8e3d395deaeb3c
	Temp/UnityTempFile-c19c09fde68d34f2a977524e2178dab6
	Temp/UnityTempFile-d242e7c46141e4bff8275837681e97c4
	Temp/UnityTempFile-d6203fcebc558428180ce94e04811230
	Temp/UnityTempFile-d736a8a0b89b040039000bca74d16c20
	Temp/UnityTempFile-de2ac5473d6b34add8233d84d06c8af8
	Temp/UnityTempFile-e04724eba30bb4dfe9e3ef7fb91ab9e8
	Temp/UnityTempFile-edc765b1893f3401a90953de26eaeef5
	Temp/UnityTempFile-f6ef8e6b9d62241379e767397d21dc07
	Temp/__EditModeScene