Updates on 0418

Updates on 0418
Update on 0418

Update on 0418
Merge branch 'master' of https://github.com/ebbyw/ZooRush-beta

Conflicts:
	Assets/HighScoresButton.cs
	Assets/HighScoresButton.cs.meta
	Assets/Resources/Prefabs/Backgrounds/New Assets/BG Grass 1.prefab
	Assets/Resources/Prefabs/Backgrounds/New Assets/BG Grass 1.prefab.meta
	Assets/Resources/Prefabs/Backgrounds/New Assets/BG Grass 2 1.prefab
	Assets/Resources/Prefabs/Backgrounds/New Assets/BG Grass 2
1.prefab.meta
	Assets/Resources/Prefabs/Backgrounds/New Assets/BG Grass 2.prefab
	Assets/Resources/Prefabs/Backgrounds/New Assets/BG Grass 2.prefab.meta
	Assets/Resources/Prefabs/Backgrounds/New Assets/BG Ocean.prefab
	Assets/Resources/Prefabs/Backgrounds/New Assets/BG Ocean.prefab.meta
	Assets/Resources/Prefabs/Backgrounds/New Assets/BG Pond.prefab
	Assets/Resources/Prefabs/Backgrounds/New Assets/BG Pond.prefab.meta
	Assets/Resources/Prefabs/Backgrounds/New Assets/BG Road 1.prefab
	Assets/Resources/Prefabs/Backgrounds/New Assets/BG Road 1.prefab.meta
	Assets/Resources/Prefabs/Backgrounds/New Assets/BG Road 2.prefab
	Assets/Resources/Prefabs/Backgrounds/New Assets/BG Road 2.prefab.meta
	Assets/Resources/Prefabs/Backgrounds/New Assets/BG Road 3.prefab
	Assets/Resources/Prefabs/Backgrounds/New Assets/BG Road 3.prefab.meta
	Assets/Resources/Prefabs/Backgrounds/New Assets/BG Road 4.prefab
	Assets/Resources/Prefabs/Backgrounds/New Assets/BG Road 4.prefab.meta
	Assets/Resources/Prefabs/Backgrounds/New Assets/BG Tree 3.prefab
	Assets/Resources/Prefabs/Backgrounds/New Assets/BG Tree 3.prefab.meta
	Assets/Resources/Prefabs/Backgrounds/New Assets/BG Tree 4.prefab
	Assets/Resources/Prefabs/Backgrounds/New Assets/BG Tree 4.prefab.meta
	Assets/Resources/Prefabs/Backgrounds/New Assets/Bridge 1.prefab
	Assets/Resources/Prefabs/Backgrounds/New Assets/Bridge 1.prefab.meta
	Assets/Resources/Prefabs/Backgrounds/New Assets/Bridge 2.prefab
	Assets/Resources/Prefabs/Backgrounds/New Assets/Bridge 2.prefab.meta
	Assets/Resources/Prefabs/Backgrounds/New Assets/Bridge 3.prefab
	Assets/Resources/Prefabs/Backgrounds/New Assets/Bridge 3.prefab.meta
	Assets/Resources/Prefabs/Backgrounds/New Assets/Bridge 4.prefab
	Assets/Resources/Prefabs/Backgrounds/New Assets/Bridge 4.prefab.meta
	Assets/Resources/Prefabs/Backgrounds/New Assets/Bush Area 1.prefab
	Assets/Resources/Prefabs/Backgrounds/New Assets/Bush Area 1.prefab.meta
	Assets/Resources/Prefabs/Backgrounds/New Assets/Bush Area 2.prefab
	Assets/Resources/Prefabs/Backgrounds/New Assets/Bush Area 2.prefab.meta
	Assets/Resources/Prefabs/Backgrounds/New Assets/Bush Area 3.prefab
	Assets/Resources/Prefabs/Backgrounds/New Assets/Bush Area 3.prefab.meta
	Assets/Resources/Prefabs/Backgrounds/New Assets/Bush Area 4.prefab
	Assets/Resources/Prefabs/Backgrounds/New Assets/Bush Area 4.prefab.meta
	Assets/Resources/Prefabs/Backgrounds/New Assets/Grass Area 1.prefab
	Assets/Resources/Prefabs/Backgrounds/New Assets/Grass Area
1.prefab.meta
	Assets/Resources/Prefabs/Backgrounds/New Assets/Grass Area 2.prefab
	Assets/Resources/Prefabs/Backgrounds/New Assets/Grass Area
2.prefab.meta
	Assets/Resources/Prefabs/Backgrounds/New Assets/Hills 1.prefab
	Assets/Resources/Prefabs/Backgrounds/New Assets/Hills 1.prefab.meta
	Assets/Resources/Prefabs/Backgrounds/New Assets/Hills 2.prefab
	Assets/Resources/Prefabs/Backgrounds/New Assets/Hills 2.prefab.meta
	Assets/Resources/Prefabs/Backgrounds/New Assets/Hills 3.prefab
	Assets/Resources/Prefabs/Backgrounds/New Assets/Hills 3.prefab.meta
	Assets/Resources/Prefabs/Backgrounds/New Assets/Mountains Area 1.prefab
	Assets/Resources/Prefabs/Backgrounds/New Assets/Mountains Area
1.prefab.meta
	Assets/Resources/Prefabs/Backgrounds/New Assets/Mountains Area 2.prefab
	Assets/Resources/Prefabs/Backgrounds/New Assets/Mountains Area
2.prefab.meta
	Assets/Resources/Prefabs/Backgrounds/New Assets/Mountains Area 3.prefab
	Assets/Resources/Prefabs/Backgrounds/New Assets/Mountains Area
3.prefab.meta
	Assets/Resources/Prefabs/Backgrounds/New Assets/Palm Tree 2.prefab
	Assets/Resources/Prefabs/Backgrounds/New Assets/Palm Tree 2.prefab.meta
	Assets/Resources/Prefabs/Buildings/Buildings - Zoo Hospital.prefab
	Assets/Resources/Prefabs/Buildings/Buildings - Zoo Hospital.prefab.meta
	Assets/Resources/Sprites/Background/Buildings/Hospital-zoo Open.anim
	Assets/Resources/Sprites/Background/Buildings/Hospital-zoo
Open.anim.meta
	Assets/Resources/Sprites/Background/Buildings/Hospital-zoo.controller

Assets/Resources/Sprites/Background/Buildings/Hospital-zoo.controller.me
ta
	Assets/Resources/Sprites/Background/Buildings/Hospital-zoo.png
	Assets/Resources/Sprites/Background/Buildings/Hospital-zoo.png.meta
	Assets/Resources/Sprites/Background/Nature.png
	Assets/Resources/Sprites/Background/Nature.png.meta
	Assets/Resources/Sprites/Background/Nature2.png
	Assets/Resources/Sprites/Background/Nature2.png.meta
	Assets/Resources/Sprites/Background/palm tree Test1-2.png
	Assets/Resources/Sprites/Background/wave Test1-2(new size).png
	Assets/Resources/Sprites/Background/wave Test1-2(new size).png.meta
	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/expandedItems
	Library/guidmapper
	Library/metadata/de/de4cf0f1ceba94b5a9fc5e5501cf851e
	Library/metadata/df/df1b0a1751cff4d43a849827c63a4cb2