Merge remote-tracking branch 'origin/master'

Zookeepers Trial/.vs/Zookeepers Trial/v14/.suo

Zookeepers Trial/Assembly-CSharp.csproj

Zookeepers Trial/Assets/Art/animations/character.controller

Zookeepers Trial/Assets/Art/maps/creation.png

Zookeepers Trial/Assets/Art/maps/creation.png.meta

Zookeepers Trial/Assets/Prefabs/Player.prefab

Zookeepers Trial/Assets/Scenes/arena.unity

Zookeepers Trial/Assets/Scenes/blacksmith.unity

Zookeepers Trial/Assets/Scenes/characterCreation.unity

Zookeepers Trial/Assets/Scenes/mainScene1.unity

Zookeepers Trial/Assets/Scenes/mainScene2.unity

Zookeepers Trial/Assets/Scenes/mainmenu.unity

Zookeepers Trial/Assets/Scripts/ArenaCombatControl.cs

Zookeepers Trial/Assets/Scripts/CharacterStats.cs

Zookeepers Trial/Assets/Scripts/EnemyAI.cs

Zookeepers Trial/Assets/Scripts/EnemyHealth.cs

Zookeepers Trial/Assets/Scripts/EnterDoor.cs

Zookeepers Trial/Assets/Scripts/PlayerHealth.cs

Zookeepers Trial/Assets/Scripts/PlayerMovement.cs

Zookeepers Trial/Assets/Scripts/ShopMenu.cs