new position generator
new position generator
Merge branch 'master' of https://github.com/southp/fungi into work

Conflicts:
	Assembly-UnityScript.pidb
	Assets/Weapon/Hammer 1.prefab.meta
	fungi.userprefs
Merge branch 'master' of https://github.com/southp/fungi into work

Conflicts:
	Assets/fungi.unity
	ProjectSettings/TagManager.asset