Merge pull request #100 from ebbyw/Ebby

Ebby
Merge pull request #103 from ebbyw/Ebby

Ebby
level updates

added some collision
changed some prefabs
Merge branch 'master' of https://github.com/ebbyw/ZooRush-beta

Conflicts:
	Assets/Scenes/Level7-Beach.unity
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.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/expandedItems
	Library/guidmapper
	Library/metadata/1d/1d7119fccdd83440882b17b5351260cb
	Library/metadata/2b/2bdf4e267b10d4b158b06a0ceadc18b2
	Library/metadata/2f/2f2dd6cbfb48a4b68ac5c4584770a8fe
	Library/metadata/36/368ed2da294014ec88f90a44d51f6991
	Library/metadata/52/52ba14195ca1140e49593cb03b036e4e
	Library/metadata/93/9314d75fdf7fd436cae93d948e44a6cd
	Library/metadata/b1/b148a09d385924216867692d7089d4e0
	Library/metadata/bc/bc6d041f205e24d57a4431af2bd617b0
	Library/metadata/c4/c4855bf15d0244ee1b0331eb67931b8f
	Library/metadata/ef/efeb99f6774a1471e92ee66efe29942c
	Library/metadata/f8/f863fa512a4b34f388ddf06bddca9d1c
	ZooRush-beta-csharp.sln
	ZooRush-beta.sln
Merge branch 'master' into Ebby

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/metadata/07/0740098c3f32a494090ba588266f0fe2
	Library/metadata/08/0820e73e1c3d540c594ed922c04cc1a1
	Library/metadata/15/15b64e13a5ce243aa9373fc1b355e694
	Library/metadata/18/184a5ad876b9b4687bbd2c7bed4213a6
	Library/metadata/23/2373bbc3a13d349579d05475be48fd11
	Library/metadata/58/586caf85dc56145c984e81d4142469a6
	Library/metadata/66/6656012c107a043318e2d5e99f45b6eb
	Library/metadata/a2/a2ddca3e6c5c14633a24ee53106c58e1
	Library/metadata/cd/cdb8e52cc98704418aadde5d336bf595
	Library/metadata/de/deb968c2295854cc0bd7cb3160800b2f
	Library/metadata/ff/ffb5af09d0eaf46898e199d263caebac
layout file changes