werty
Merge branch 'master' of https://github.com/dmg0600/necroffice

Conflicts:
	Assets/Creatures/prefabs/Creature.prefab
	Assets/Prefabs_angel_random.meta
	Assets/Scenes/Main.unity