New animations merge

# Conflicts:
#	Zookeepers Trial/Library/CurrentLayout.dwlt
#	Zookeepers Trial/Library/InspectorExpandedItems.asset
#	Zookeepers Trial/Library/LastSceneManagerSetup.txt
#	Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll
#	Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
#	Zookeepers Trial/Library/assetDatabase3
#	Zookeepers Trial/Library/metadata/00/00000000000000004000000000000000
#	Zookeepers Trial/Library/metadata/00/00000000000000006100000000000000

Zookeepers Trial/Temp/UnityTempFile-7199c7d9335463c49892ada4cd968c19

+-debug
+-target:library
+-nowarn:0169
+-out:Temp/Assembly-CSharp.dll
+-r:"C:/Program Files/Unity/Editor/Data/Managed/UnityEngine.dll"
+-r:"C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll"
+-r:"C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll"
+-r:"C:/Program Files/Unity/Editor/Data/Managed/UnityEditor.dll"
+-define:UNITY_5_3_OR_NEWER
+-define:UNITY_5_4_OR_NEWER
+-define:UNITY_5_4_1
+-define:UNITY_5_4
+-define:UNITY_5
+-define:ENABLE_NEW_BUGREPORTER
+-define:ENABLE_AUDIO
+-define:ENABLE_CACHING
+-define:ENABLE_CLOTH
+-define:ENABLE_DUCK_TYPING
+-define:ENABLE_EDITOR_RETINA
+-define:ENABLE_RETINA_GUISTYLES
+-define:ENABLE_FRAME_DEBUGGER
+-define:ENABLE_GENERICS
+-define:ENABLE_HOME_SCREEN
+-define:ENABLE_IMAGEEFFECTS
+-define:ENABLE_LIGHT_PROBES_LEGACY
+-define:ENABLE_MICROPHONE
+-define:ENABLE_MULTIPLE_DISPLAYS
+-define:ENABLE_PHYSICS
+-define:ENABLE_PLUGIN_INSPECTOR
+-define:ENABLE_SHADOWS
+-define:ENABLE_SPRITERENDERER_FLIPPING
+-define:ENABLE_SPRITES
+-define:ENABLE_SPRITE_POLYGON
+-define:ENABLE_TERRAIN
+-define:ENABLE_RAKNET
+-define:ENABLE_UNET
+-define:ENABLE_UNITYEVENTS
+-define:ENABLE_VR
+-define:ENABLE_WEBCAM
+-define:ENABLE_WWW
+-define:ENABLE_CLOUD_SERVICES
+-define:ENABLE_CLOUD_SERVICES_COLLAB
+-define:ENABLE_CLOUD_SERVICES_ADS
+-define:ENABLE_CLOUD_HUB
+-define:ENABLE_CLOUD_PROJECT_ID
+-define:ENABLE_CLOUD_SERVICES_CRASH_REPORTING
+-define:ENABLE_CLOUD_SERVICES_PURCHASING
+-define:ENABLE_CLOUD_SERVICES_ANALYTICS
+-define:ENABLE_CLOUD_SERVICES_UNET
+-define:ENABLE_CLOUD_SERVICES_BUILD
+-define:ENABLE_CLOUD_LICENSE
+-define:ENABLE_EDITOR_METRICS
+-define:ENABLE_EDITOR_METRICS_CACHING
+-define:INCLUDE_DYNAMIC_GI
+-define:INCLUDE_GI
+-define:INCLUDE_IL2CPP
+-define:INCLUDE_DIRECTX12
+-define:PLATFORM_SUPPORTS_MONO
+-define:RENDER_SOFTWARE_CURSOR
+-define:INCLUDE_PUBNUB
+-define:ENABLE_LOCALIZATION
+-define:ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION
+-define:ENABLE_EDITOR_TESTS_RUNNER
+-define:UNITY_STANDALONE_WIN
+-define:UNITY_STANDALONE
+-define:ENABLE_SUBSTANCE
+-define:ENABLE_TEXTUREID_MAP
+-define:ENABLE_RUNTIME_GI
+-define:ENABLE_MOVIES
+-define:ENABLE_NETWORK
+-define:ENABLE_CRUNCH_TEXTURE_COMPRESSION
+-define:ENABLE_UNITYWEBREQUEST
+-define:ENABLE_EVENT_QUEUE
+-define:ENABLE_CLUSTERINPUT
+-define:ENABLE_WEBSOCKET_HOST
+-define:ENABLE_MONO
+-define:ENABLE_PROFILER
+-define:DEBUG
+-define:TRACE
+-define:UNITY_ASSERTIONS
+-define:UNITY_EDITOR
+-define:UNITY_EDITOR_64
+-define:UNITY_EDITOR_WIN
+-define:UNITY_TEAM_LICENSE
+Assets/Scripts/ArenaCombatControl.cs
+Assets/Scripts/CameraMovement.cs
+Assets/Scripts/Collisions.cs
+Assets/Scripts/CurrentWeapon.cs
+Assets/Scripts/DecisionTree.cs
+Assets/Scripts/EnemyAI.cs
+Assets/Scripts/EnemyHealth.cs
+Assets/Scripts/InBetween.cs
+Assets/Scripts/InBetweenAI.cs
+Assets/Scripts/InBetweenCamera.cs
+Assets/Scripts/MainMenu.cs
+Assets/Scripts/PlayerHealth.cs
+Assets/Scripts/PlayerMovement.cs
+Assets/Scripts/PlayerStats.cs
+Assets/Scripts/Portrait.cs
+Assets/Scripts/Prefight.cs
+Assets/Scripts/RandomPlatforms.cs
+Assets/Scripts/characterCreation/ChooseCharLook.cs
+Assets/Scripts/characterCreation/ChooseCharStats.cs
+Assets/Scripts/enemyAppearance/RandomFace.cs
+Assets/Scripts/enemyAppearance/RandomHead.cs
+Assets/Scripts/enemyAppearance/RandomLegs.cs
+Assets/Scripts/enemyAppearance/RandomShield.cs
+Assets/Scripts/enemyAppearance/RandomSword.cs
+Assets/Scripts/scriptableObjects/ArmourStats.cs
+Assets/Scripts/scriptableObjects/BlessingObject.cs
+Assets/Scripts/scriptableObjects/CreateArmour.cs
+Assets/Scripts/scriptableObjects/CreateBlessing.cs
+Assets/Scripts/scriptableObjects/CreatePotion.cs
+Assets/Scripts/scriptableObjects/CreateWeapon.cs
+Assets/Scripts/scriptableObjects/Money.cs
+Assets/Scripts/scriptableObjects/PotionObject.cs
+Assets/Scripts/scriptableObjects/WeaponStats.cs
+Assets/Scripts/setAppearance.cs
+Assets/Scripts/shopScripts/ArmourList.cs
+Assets/Scripts/shopScripts/ArmouryShopButton.cs
+Assets/Scripts/shopScripts/BlessingShopButton.cs
+Assets/Scripts/shopScripts/ChurchShopButton.cs
+Assets/Scripts/shopScripts/EnterDoor.cs
+Assets/Scripts/shopScripts/PotionList.cs
+Assets/Scripts/shopScripts/ShopMenu.cs
+Assets/Scripts/shopScripts/ShopPages.cs
+Assets/Scripts/shopScripts/WeaponList.cs
+Assets/Scripts/shopScripts/WeaponShopButton.cs
+-r:"C:\Program Files\Unity\Editor\Data\Mono\lib\mono\unity\System.Runtime.Serialization.dll"
+-r:"C:\Program Files\Unity\Editor\Data\Mono\lib\mono\unity\System.Xml.Linq.dll"