forgot to close other instance of Unity
Merge branch 'Ebby' of https://github.com/ebbyw/ZooRush-beta into Ebby

Conflicts:
	Assets/Scripts/SceneManager.cs
	Assets/Scripts/TutorialMode.cs
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/30/302a61e28ecf94f0cb6a34f6dd41628e
	Library/metadata/36/368ed2da294014ec88f90a44d51f6991
	Library/metadata/39/395a2686f9e2d472a8ec2c5bb0e4e69b
	Library/metadata/3b/3bb407349a65542e985ac560b468f09d
	Library/metadata/3e/3e62cec967ca54d99a313046cb2e7422
	Library/metadata/70/700629fb309a247a980bb8130bf5a984
	Library/metadata/73/736b94dc4e52245b7b4ba01ea020d000
	Library/metadata/78/784aad15258d34709963140e92fcd50b
	Library/metadata/79/79c03794b81804bcc80e74e235f8f029
	Library/metadata/7d/7da52503ddbac4dc78dce47cd6653a7e
	Library/metadata/7f/7f9c7debeebd24fdd9c275ce785f0a71
	Library/metadata/83/833e02dedf9b941f4889bf9cbd84f39f
	Library/metadata/8d/8d243a1c312814be8af7471e927c5fc7
	Library/metadata/93/9314d75fdf7fd436cae93d948e44a6cd
	Library/metadata/9f/9f8cdbefd95134ce3a983b5cf0b45b61
	Library/metadata/aa/aab3b48ac618649e88a695595b465363
	Library/metadata/bb/bb4895ff08e3c4499b295eaccfe533ac
	Library/metadata/bc/bc356644bdc5c4020b99b1598eeafde3
	Library/metadata/c4/c4855bf15d0244ee1b0331eb67931b8f
	Library/metadata/d8/d81cb0ff7857d4defa02d7dcb59c06c2
	Library/metadata/dc/dc402b4a5fd274b478cc8a74af314023
	Library/metadata/e9/e9bd80de06d164cf99f9dc89070f0a9f
	Library/metadata/ee/ee17b7ff5a6ae46f5844171d70b58525
	Library/metadata/ef/ef5ce066ffb944cfd86facacbb2b0d81
	Library/metadata/f8/f863fa512a4b34f388ddf06bddca9d1c
	Library/metadata/fd/fda4c7a3512d34f37aa397176e187625
more changes
Moving object spawner
Merge branch 'Ebby' of https://github.com/ebbyw/ZooRush-beta into Ebby

Conflicts:
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/1b/1b345fd32a6eb45b6b52f306df73a771
	Library/metadata/39/395a2686f9e2d472a8ec2c5bb0e4e69b
	Library/metadata/7e/7ebf3c554ad4c414d955e6e20d7a5138
	Library/metadata/93/9314d75fdf7fd436cae93d948e44a6cd
	Library/metadata/dc/dc402b4a5fd274b478cc8a74af314023
Merge branch 'Ebby'

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper