bleh i hate git
Merge branch 'master' of https://github.com/merrickfox/ThePerfectGame

Conflicts:
	Assets/Scenes/Woods.unity
Changes
Merge branch 'master' of https://github.com/merrickfox/ThePerfectGame

Conflicts:
	Assets/New Terrain.asset
	Assets/Prefabs/BoxTrap.prefab
	Assets/Scripts/Item_Class.cs
	Assets/Scripts/JP_FG_Recipes.cs
	Assets/Scripts/JP_TrapSelection.cs.meta
	Assets/Wild Scenery Kit/Demo Scene/New Terrain.asset
	Assets/Wild Scenery Kit/Prefabs (Ready to use)/Plants and Foliage/Tree6.prefab