Merge branch 'origin/feature/SpawnLogic'

Conflicts:
	Assets/Resources/hero01.prefab
	Assets/Scenes/Scene1.unity
	Assets/Scenes/Scene2.unity
	Project3-csharp.v11.suo (reverted from commit 75c986a04f07bb1ef8f9f04f5ba33d232688fc12)