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

Conflicts:
	UnityProject/Assets/Demo 05_26.unity
	UnityProject/Assets/LowPolyBushVinesPackage/Standard Assets/Standard Assets.meta
	UnityProject/Assets/LowPolyBushVinesPackage/Standard Assets/Terrain Assets/Terrain Grass.meta
	UnityProject/Assets/LowPolyBushVinesPackage/Standard Assets/Terrain Assets/Terrain Textures.meta
	UnityProject/Assets/LowPolyBushVinesPackage/Standard Assets/Terrain Assets/Trees Ambient-Occlusion/Palm/Materials.meta
	UnityProject/Assets/Models/Stone/Stone_Forest_1_Obj/Stone_Forest_1_LOD1/Thumbs.db.meta
	UnityProject/Assets/Scripts/Equippables/GUI.meta
Merge branch 'master' of https://github.com/sethnel99/HungerGame