no changes
switching computers
Merge branch 'Ebby' of https://github.com/ebbyw/ZooRush-beta into Ebby

Conflicts:
	Assembly-CSharp-Editor-vs.csproj
	Assembly-CSharp-Editor.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	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/03/0367732686b8440bba79ed8264af8e05
	Library/metadata/05/0525b21cfa52e4c73a5100bcf06727ab
	Library/metadata/06/06c456022a4ff44eaa054b41d914c955
	Library/metadata/07/0770e13d2a8854c7ab1698cb1bb2b00a
	Library/metadata/0a/0a324fea7217346eb8bc1fb8f1d5ad2b
	Library/metadata/0a/0aea86e3ddc3242dabe0a1d409b9613f
	Library/metadata/0d/0d89aae2eb252419cab12c7e49b63175
	Library/metadata/0f/0fe0bdce1034649cd89931d04166e330
	Library/metadata/12/127635ddb66a64a84ba971a77acf96ea
	Library/metadata/15/1578491f5e2134a77a0f7d6056d5b894
	Library/metadata/17/173603b9e5d8c41f9adbeb53e27375cb
	Library/metadata/17/1768caf262aae41f79d2d8c05a8114c6
	Library/metadata/18/181345c2f7e1e4916aa1eecf62784d8c
	Library/metadata/1d/1d57be841f9424aff940e44062009386
	Library/metadata/1d/1d7119fccdd83440882b17b5351260cb
	Library/metadata/1d/1df1701cf589c45e5a8f75c8b86b34e7
	Library/metadata/22/22ace41ee88384ca7bc64740a212d0cb
	Library/metadata/22/22e99f03d08ab44798126e31a6d715be
	Library/metadata/23/23ac51683018b4a5098591076108d02b
	Library/metadata/24/24e348494a7d84db7870860ed0ff2684
	Library/metadata/25/25979fc38240d46c996efb8487cbcfa5
	Library/metadata/25/2597f649d519d4ed696c3c351552b9e1
	Library/metadata/26/26a8b0826647c415b893df28e503ce4c
	Library/metadata/27/27a4d82f10e6549f2a5ed745b9c3fe4c
	Library/metadata/28/2884aaa423b8c49558eb05399e4fd923
	Library/metadata/2b/2b7c68c1e35f54054a972e22e7e97760
	Library/metadata/2c/2ce0d1322bde244219cd33ab786db642
	Library/metadata/30/302a61e28ecf94f0cb6a34f6dd41628e
	Library/metadata/30/304187c8099c94a4082f95973db80d19
	Library/metadata/30/3051d9c3e71cb42c59a8e6bf0dabb446
	Library/metadata/31/31173e0f982e043d49da86008f47dcf5
	Library/metadata/32/3236b5d1cc85a46aaafa7817d887184b
	Library/metadata/36/368ed2da294014ec88f90a44d51f6991
	Library/metadata/36/369866166e3b14a2d9fb8dbc3ce0aa3e
	Library/metadata/37/37827c8c6948f4ea9acec58287212a9b
	Library/metadata/39/395a2686f9e2d472a8ec2c5bb0e4e69b
	Library/metadata/39/397f4451a1d0f42b7b7924f0b612e801
	Library/metadata/3c/3c2374897620645c784498121c235fb8
	Library/metadata/3d/3d9b6c439ac19447ab1696ab054ff0a2
	Library/metadata/3d/3de73eb80c28e4cee9c4aafd47696fb6
	Library/metadata/3e/3e162dd91411947eaae860e44505d557
	Library/metadata/3e/3e21c9234a231476aa7dbccad01e7ca9
	Library/metadata/3e/3e62cec967ca54d99a313046cb2e7422
	Library/metadata/3e/3e88159f594ba4b8c822baf677b27a5b
	Library/metadata/3f/3fd4bfe840fe54e8eba949795047468b
	Library/metadata/40/40a1b5e27b00e4a8ba9ee4c98cf1e026
	Library/metadata/43/435003bc53fe54cfa8549738219e59e7
	Library/metadata/43/436ec216e094d4081877e9fa28525ee8
	Library/metadata/43/4378770c742044699b9175a941d9b8cf
	Library/metadata/45/45038d3ad17604b0d9cde019debba195
	Library/metadata/45/45191a64f2cab4c6b8da841a413610d3
	Library/metadata/48/485d9cc251f7149b4956680386307ac1
	Library/metadata/4b/4b4d0dfc493964a78a659bcd1966c9b9
	Library/metadata/4b/4ba7a6fb639da4ababa4d576a5615b56
	Library/metadata/4d/4dcd581b7783f4497b6774c77219f97e
	Library/metadata/4e/4e020fd39eb7c44d0be7a28a2a8a961f
	Library/metadata/4e/4e66dea5cf1cf415683becedf97abcd1
	Library/metadata/4e/4ee4320857c604b1e9fcfcd9f2341d3a
	Library/metadata/4f/4f398045902bd4a7dbb22f7e230d8999
	Library/metadata/50/505ea58b3b1684eab97d0eb74a0383e8
	Library/metadata/50/50d111f5b5d9f4c4da03458053a4c1d3
	Library/metadata/51/51085454a57c44eb4810d8e5cf46938e
	Library/metadata/52/52a8a2eac7abc423da422c1c633763a2
	Library/metadata/52/52ba14195ca1140e49593cb03b036e4e
	Library/metadata/53/53ec42358501c48b4a132378011b0ac2
	Library/metadata/55/55ec280dce828407cbb854ccd0ab695b
	Library/metadata/56/56d0dd0f83c6b4d8ca879e10d395c75f
	Library/metadata/56/56e3228a6334d436c804276aeee7888c
	Library/metadata/59/591458324373a474192815ae25a9b0d6
	Library/metadata/59/593af68535d1a4c09b89b5f083b3be4c
	Library/metadata/5d/5d4f8155a78154a5097ecf0caa7c7c96
	Library/metadata/5d/5df09f25a64db416ba850b99939a7ecd
	Library/metadata/60/602a88b8949bf475f82b73761d7f2133
	Library/metadata/61/61758d29a3e484db69b60b99e07ca6fd
	Library/metadata/61/619aa9cc19ad24ed3824b7837f81b6b4
	Library/metadata/62/62a04abde8f70466188dad9fe7a0e2b0
	Library/metadata/64/64349ea125d0e4f728fece3a47cd4a52
	Library/metadata/64/64672be65ef0c41c78b76b8463332142
	Library/metadata/64/64760d4841c624d9a954030922e909da
	Library/metadata/65/65a380fb52b454236b430dc8285b11d2
	Library/metadata/66/66e82a38f39124efc840433e123d67ea
	Library/metadata/68/68d3b3ba2efa6424a9d2d45002381e21
	Library/metadata/6b/6b55f02d08d244c52a7bde4e23c7d516
	Library/metadata/6b/6bb5f779ea370486fa1e244bb9450c33
	Library/metadata/6c/6cf3fe46531434249b74864c6d264158
	Library/metadata/6d/6dbc54ba286604dc997d005b9566b891
	Library/metadata/6e/6ed659650684a474cb316ce46bc856f0
	Library/metadata/70/700629fb309a247a980bb8130bf5a984
	Library/metadata/71/71c064af8454747f599caea4efb3ac41
	Library/metadata/71/71ee99c0b729441b9917560891a4cb93
	Library/metadata/72/72f439578201b44288229540465149bd
	Library/metadata/74/749c3a886a7644340842085f8ab2a952
	Library/metadata/74/74f6165cdc31346198c015a45d1ecc71
	Library/metadata/75/751ef9e5e531a4a9cb1cff8bee21a1bf
	Library/metadata/76/76a124623d7bb452cb227ddb2d11e49c
	Library/metadata/78/784aad15258d34709963140e92fcd50b
	Library/metadata/79/79c03794b81804bcc80e74e235f8f029
	Library/metadata/7c/7cef8c2b1cd1f419990a308170aa94d8
	Library/metadata/7d/7da52503ddbac4dc78dce47cd6653a7e
	Library/metadata/7e/7e00898a8438d4e85ae5f93f9b36b781
	Library/metadata/7e/7ebf3c554ad4c414d955e6e20d7a5138
	Library/metadata/7f/7f9c7debeebd24fdd9c275ce785f0a71
	Library/metadata/82/8266c195b915b470981d8b873fd4c68b
	Library/metadata/83/833bc88762d5d458bb36da306fea80ad
	Library/metadata/86/866c399e1975f4c598c90aea7f1951a2
	Library/metadata/88/8834767cc946847f8bda0c1d3795c2a3
	Library/metadata/8a/8a2e56903973b4038be8d98705604050
	Library/metadata/8a/8a6a0458642dd4191bd799f60b040cee
	Library/metadata/8d/8d243a1c312814be8af7471e927c5fc7
	Library/metadata/8f/8ff23c692bb9242b0933edc4c565f4ae
	Library/metadata/92/9219d448fbd1649eeb975b4c15f47e2a
	Library/metadata/93/9314d75fdf7fd436cae93d948e44a6cd
	Library/metadata/96/96b824aed64a247f3859fdd17fd91d40
	Library/metadata/97/9771e42d5bfbe4dff956b92eb057c9f3
	Library/metadata/97/9775a338178994e248947b2c17f47821
	Library/metadata/98/981a2537aa1ea451287b0529699c15f8
	Library/metadata/98/98e3d6c292b69489d83dac9f49c672aa
	Library/metadata/9e/9ed650f005a994739a9e3fd2fd5e2338
	Library/metadata/a0/a0e6a951f2a804c498b57a79edfc6cdb
	Library/metadata/a2/a213d52a5af74405fb72f8ee9908ddc0
	Library/metadata/a5/a5543430d07814c6692a572a725cc962
	Library/metadata/a5/a5e430a9156714a04bc9b9e969377b35
	Library/metadata/a6/a6f49a18830f749088b706df189f9367
	Library/metadata/a7/a7d97864ade92499a8f38bd0e0e52c8f
	Library/metadata/a8/a819863f80d4b4e0fa3a47a8bc58ba4c
	Library/metadata/aa/aa363cf245bd945f2addc37612986cb0
	Library/metadata/aa/aa92ae88d821a4851a4400a068313e99
	Library/metadata/aa/aab3b48ac618649e88a695595b465363
	Library/metadata/ac/ac367411a033d4cb5b402fa6144f8250
	Library/metadata/ac/aca0964da7322472c96ecf1b884b9e6a
	Library/metadata/ad/ad006d1a800304711bab9efafa03db3a
	Library/metadata/ad/ad2189e50721f402bb953cedfbf67e9a
	Library/metadata/ad/adc7897b83d534fdea8465d5a72b481b
	Library/metadata/ae/ae5295f7643be40f0b6da924cfbe89ed
	Library/metadata/af/aff86f3e610204c139f6410446996d3b
	Library/metadata/b1/b1ad97f5e64244b639971dc939082f4e
	Library/metadata/b4/b451e7ef079a64b25835f7801a60da33
	Library/metadata/b4/b4567074cce5f432682c57e4e6b35403
	Library/metadata/b5/b5ce80361ba5d4bce8fd4733252b414d
	Library/metadata/b7/b76c42e80d87945319b4608378c7bd98
	Library/metadata/b7/b7aaa742b953147c2b33cc2d68b6c905
	Library/metadata/b7/b7ca723cb249241b4bbbc5c7ce9e6944
	Library/metadata/b9/b915ac97b503e475aa44f7085fb096a6
	Library/metadata/ba/ba05d560b608b48b2b1387a31b6d1d31
	Library/metadata/bb/bb4895ff08e3c4499b295eaccfe533ac
	Library/metadata/bb/bb67392ec7725414aba4bd75253b7d58
	Library/metadata/bc/bc6d041f205e24d57a4431af2bd617b0
	Library/metadata/bc/bcd7121655123435daa7bec3b05af57b
	Library/metadata/be/be5819cdefc454ec380f284d64d5ea80
	Library/metadata/bf/bfa8b25d3b7f94dcaab986e9d8a62d4e
	Library/metadata/c0/c02275f29c6524d0c8e91bf5f60db781
	Library/metadata/c0/c0b79f47896364545a192faa093e234e
	Library/metadata/c4/c4292919a189649f7b2b86de2583afcc
	Library/metadata/c4/c4855bf15d0244ee1b0331eb67931b8f
	Library/metadata/c4/c4ae47736844644089f4f5c7b5c2f3a0
	Library/metadata/c5/c5b9dccf69ebe4c54b51bda5fc213d66
	Library/metadata/c5/c5f22328cfa7349fea1228d159a1b8e8
	Library/metadata/c7/c782ac56f3916463da7eb3c7f20d8284
	Library/metadata/c8/c82c1f9d1444445758322516c0e22d7a
	Library/metadata/c9/c9de622550bc842e7a57abb41baebdb0
	Library/metadata/cb/cb61a9599839f484c9ced77178b41ae0
	Library/metadata/cc/cc14072e5fed44cadaf062ad2f7bd48c
	Library/metadata/cf/cf05fdedb035a452297c9d593c7aa307
	Library/metadata/cf/cf53726df031d414980289b7680b94d5
	Library/metadata/d0/d05453793b35147349f4692e9e131560
	Library/metadata/d0/d088d3e2a5acb4df0bd82e4eb552de96
	Library/metadata/d0/d0aaf250c164949a4a7566fbebee2387
	Library/metadata/d1/d1140bd835e2e43248eafeb47b95c61c
	Library/metadata/d2/d26be30e5788e4eb1a710bbfd0356b36
	Library/metadata/d3/d3e65dc47a44a4ba493046a54d9b2809
	Library/metadata/d6/d6f794ca40cbe4eab98594cd21a10edd
	Library/metadata/d8/d81cb0ff7857d4defa02d7dcb59c06c2
	Library/metadata/d8/d869a80514b3346fea93c274e8ff8c4a
	Library/metadata/d8/d8f78ecdca71445dc92987993e47fe9b
	Library/metadata/d9/d9ef5cb27e48f4735a134cae3a3d743e
	Library/metadata/da/da9ec1eea7884462893deb4a44d3f68d
	Library/metadata/db/dbf8d2a504e9541569c87efdc704d0a9
	Library/metadata/dc/dc402b4a5fd274b478cc8a74af314023
	Library/metadata/dc/dcd8ae0925f634e2ca59c37d999200b5
	Library/metadata/de/de3789768cf2145a3a49680dc05a7546
	Library/metadata/df/df9d86a50c79546e8a95a7ca7eb43af3
	Library/metadata/e2/e2df54d3d23a9417b8cf9b10917e67fb
	Library/metadata/e5/e582142960ea54ae8a888f7922e994fe
	Library/metadata/ed/ed2ba75a23ded428d8ca4a63febf35ca
	Library/metadata/ed/ed961fd2bbb5f4c76b19e0754807f320
	Library/metadata/ee/ee17b7ff5a6ae46f5844171d70b58525
	Library/metadata/ef/ef5ce066ffb944cfd86facacbb2b0d81
	Library/metadata/f0/f023cbe5fe50242cdb3b4fa3129d7486
	Library/metadata/f1/f1dac5cb4448a4cc3a05037860ad8641
	Library/metadata/f3/f384087e7f22f4f1da185345111ee7fe
	Library/metadata/f4/f4036537442d2445f81536b0c9b7fd4e
	Library/metadata/f4/f4418c55f73674a4f8e3ce18ca128e65
	Library/metadata/f5/f5c56d4ca121a4976a72ac648850309a
	Library/metadata/f8/f863fa512a4b34f388ddf06bddca9d1c
	Library/metadata/f9/f948a3c783fe24809bd4541f8a396872
	Library/metadata/fb/fb9b085f6471247bf859341e1e57cdca
	Library/metadata/fc/fc5abeb574f4842bba2102fa0299b244
	Library/metadata/fc/fcc75f4e3ffe34628b8fdca268bf9b72
	Library/metadata/fd/fd4bf70d68f8a478c9896815fcac52b7
	Library/metadata/fd/fd89309e31e27406f9c3a04c1e04843e
	Library/metadata/fd/fda4c7a3512d34f37aa397176e187625
	Library/metadata/fe/fe20648c9ae504ae69aa5d968fd437d9
	Library/metadata/fe/feba1bba74143455487efcf93107b91a
	ZooRush-beta-csharp.sln
	ZooRush-beta.sln
endless mode framework set up, needs testing
Made destroyable objects repeatable (ex: Water Bottles, indfections, etc)
Merge pull request #34 from ebbyw/Ebby

Ebby