opened unity
Merge pull request #157 from ebbyw/Ebby

Ebby
not entirely sure

opened and built different versions for the play test
Merge branch 'master' into Ebby

Conflicts:
	Library/CurrentLayout.dwlt
	Library/EditorUserBuildSettings.asset
	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/08/0820e73e1c3d540c594ed922c04cc1a1
	Library/metadata/15/15b64e13a5ce243aa9373fc1b355e694
	Library/metadata/18/184a5ad876b9b4687bbd2c7bed4213a6
	Library/metadata/23/2373bbc3a13d349579d05475be48fd11
	Library/metadata/28/2884aaa423b8c49558eb05399e4fd923
	Library/metadata/36/36fbd07eb7dd74b72afd604dcdcee4ac
	Library/metadata/3d/3d9b6c439ac19447ab1696ab054ff0a2
	Library/metadata/55/55f08b9f8b40e45e7aee2aedb0ef2471
	Library/metadata/58/586caf85dc56145c984e81d4142469a6
	Library/metadata/71/71ee99c0b729441b9917560891a4cb93
	Library/metadata/79/79c03794b81804bcc80e74e235f8f029
	Library/metadata/7e/7e9bd471095424c678f0ecc46068af94
	Library/metadata/9f/9ff27db64c0d748df8fa10719b2dc088
	Library/metadata/aa/aa514f5bdf67c4a22b9aec1af876a3d1
	Library/metadata/ac/aca461024ed274d109990580a1ae87f3
	Library/metadata/cd/cdb8e52cc98704418aadde5d336bf595
	Library/metadata/de/deb968c2295854cc0bd7cb3160800b2f
	Library/metadata/ef/efeb99f6774a1471e92ee66efe29942c
	Library/metadata/fe/feba1bba74143455487efcf93107b91a
	ZooRush-beta-csharp.sln
	ZooRush-beta.sln
	ZooRush-beta.userprefs