Intermediary commit
Merge branch 'master' of https://github.com/sethnel99/HungerGame

Conflicts:
	UnityProject/Assembly-UnityScript-firstpass-vs.unityproj
	UnityProject/Assembly-UnityScript-firstpass.unityproj
	UnityProject/Assembly-UnityScript-vs.unityproj
	UnityProject/Assembly-UnityScript.unityproj
	UnityProject/Assets/Models/Axe/Axe.prefab
	UnityProject/Assets/Models/Axe/EquippedAxe.cs
	UnityProject/Assets/Scripts/GameScripts/Inventory&Items/Items/FireItem.cs
	UnityProject/Assets/Scripts/HUD scripts/PlayerVitals.cs
	UnityProject/Assets/Scripts/Inventory&Items/ItemManagers/ItemManager.cs
	UnityProject/Assets/Scripts/Inventory&Items/Items/SharpStoneItem.cs
	UnityProject/Assets/Standard Assets/Character Controllers/Sources/Scripts/FPSInputController.js
	UnityProject/ProjectSettings/TagManager.asset
	UnityProject/UnityProject-csharp.sln
	UnityProject/UnityProject.sln
Merge Fixes and Preliminary Dog