Merge pull request #211 from ebbyw/Ebby

Ebby
Merge pull request #212 from ebbyw/Ebby

new intro story completed
opened unity
Merge branch 'master' of https://github.com/ebbyw/ZooRush-beta

Conflicts:
	Assets/Resources/Sprites/Background/Buildings/Houses.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/metadata/0b/0bcdd3bdcdc1f48afa63ccc79920deee
	Library/metadata/30/302a61e28ecf94f0cb6a34f6dd41628e
	Library/metadata/7f/7f43c711fcfd84ff6934f5b9249ff224
	Library/metadata/83/838942c00b1bb4b2b9d716d369a75063
	Library/metadata/85/85d7584b25116473e891514ae8023636
	Library/metadata/89/89ff360bd9bb44957a8616833a63b211
	Library/metadata/a5/a5543430d07814c6692a572a725cc962
	Library/metadata/ac/aca461024ed274d109990580a1ae87f3
	Library/metadata/bc/bc1c5369db641417cb508c6ac059f06a
	Library/metadata/d0/d09634ea972304072a28ff4eae0bc23e
	Library/metadata/f4/f46f74293c4a04e3c9faa3f06d8148ac
	Library/metadata/fd/fda4c7a3512d34f37aa397176e187625
Merge branch 'master' 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/metadata/1b/1ba8f8ec4f85c46468853761bb7d8ff1
	ZooRush-beta-csharp.sln
	ZooRush-beta.sln