switching computers
Merge branch 'Ebby' of https://github.com/ebbyw/ZooRush-beta 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/guidmapper
	Library/metadata/02/02902a4e68e6644af9cc20ace64ab614
	Library/metadata/04/0401f3340fc0242369b2263006aed6ca
	Library/metadata/05/0525b21cfa52e4c73a5100bcf06727ab
	Library/metadata/06/06b486aa2fda442f7b6901f514da7176
	Library/metadata/07/0740098c3f32a494090ba588266f0fe2
	Library/metadata/08/0820e73e1c3d540c594ed922c04cc1a1
	Library/metadata/0d/0d7e91750f9554ba191b672510ec1cad
	Library/metadata/0e/0e99f90cefc1943649aa1f28217aed85
	Library/metadata/12/127635ddb66a64a84ba971a77acf96ea
	Library/metadata/15/15b64e13a5ce243aa9373fc1b355e694
	Library/metadata/18/184a5ad876b9b4687bbd2c7bed4213a6
	Library/metadata/1d/1d7119fccdd83440882b17b5351260cb
	Library/metadata/23/2373bbc3a13d349579d05475be48fd11
	Library/metadata/24/24e348494a7d84db7870860ed0ff2684
	Library/metadata/26/26cf659cd4b1b4aedb54629a2cc60150
	Library/metadata/30/302a61e28ecf94f0cb6a34f6dd41628e
	Library/metadata/35/35c0b71a63d4f4c0a9c888a016fbe412
	Library/metadata/36/369866166e3b14a2d9fb8dbc3ce0aa3e
	Library/metadata/3f/3fd4bfe840fe54e8eba949795047468b
	Library/metadata/41/413d6b39c17b646578bc19fbc973b19c
	Library/metadata/43/436ec216e094d4081877e9fa28525ee8
	Library/metadata/48/485d9cc251f7149b4956680386307ac1
	Library/metadata/4b/4b662db90c58f42b6937818fa0365292
	Library/metadata/4c/4c53765aa567e4f03a6c6f9999e2d519
	Library/metadata/52/52ba14195ca1140e49593cb03b036e4e
	Library/metadata/55/55ec280dce828407cbb854ccd0ab695b
	Library/metadata/58/586caf85dc56145c984e81d4142469a6
	Library/metadata/58/58e1e2d81137e45ae9954d72e8b107ec
	Library/metadata/59/591458324373a474192815ae25a9b0d6
	Library/metadata/5c/5ce92dd29368c4d5fa75b7a7f40935e1
	Library/metadata/60/602a88b8949bf475f82b73761d7f2133
	Library/metadata/61/61758d29a3e484db69b60b99e07ca6fd
	Library/metadata/61/619aa9cc19ad24ed3824b7837f81b6b4
	Library/metadata/62/62a04abde8f70466188dad9fe7a0e2b0
	Library/metadata/64/64672be65ef0c41c78b76b8463332142
	Library/metadata/64/64687af1e761f4c4d9cb76bad0c95c7f
	Library/metadata/64/64760d4841c624d9a954030922e909da
	Library/metadata/66/6656012c107a043318e2d5e99f45b6eb
	Library/metadata/6d/6dbc54ba286604dc997d005b9566b891
	Library/metadata/6e/6e6f71ad41c0c40f28ba1e560d640fdc
	Library/metadata/6e/6ed659650684a474cb316ce46bc856f0
	Library/metadata/71/71ee99c0b729441b9917560891a4cb93
	Library/metadata/75/753300923fa6a4a77ab182086a6a23d1
	Library/metadata/77/77ae970e14e784834b08f9de3bc5f8bf
	Library/metadata/78/784aad15258d34709963140e92fcd50b
	Library/metadata/79/79c03794b81804bcc80e74e235f8f029
	Library/metadata/7a/7a97be5a10bcd46ff9c89d5b3fc1e505
	Library/metadata/7d/7da52503ddbac4dc78dce47cd6653a7e
	Library/metadata/80/8004b61d1cebe4c58b8df0051a1bd437
	Library/metadata/82/8266c195b915b470981d8b873fd4c68b
	Library/metadata/83/833bc88762d5d458bb36da306fea80ad
	Library/metadata/83/838942c00b1bb4b2b9d716d369a75063
	Library/metadata/84/84ecd6206e41749869da6210b98cd8ce
	Library/metadata/8a/8a6a0458642dd4191bd799f60b040cee
	Library/metadata/8b/8b9836729b9f34a5abb086a371214168
	Library/metadata/92/9219d448fbd1649eeb975b4c15f47e2a
	Library/metadata/93/9314d75fdf7fd436cae93d948e44a6cd
	Library/metadata/96/96b824aed64a247f3859fdd17fd91d40
	Library/metadata/9e/9e5b35c1c9cc84f08a9574f7c1f927d7
	Library/metadata/9e/9ed650f005a994739a9e3fd2fd5e2338
	Library/metadata/a2/a2ddca3e6c5c14633a24ee53106c58e1
	Library/metadata/a5/a5e430a9156714a04bc9b9e969377b35
	Library/metadata/a6/a6edc99f952794ac5a4b3ce5ea3ebe2c
	Library/metadata/a6/a6f49a18830f749088b706df189f9367
	Library/metadata/a7/a7d97864ade92499a8f38bd0e0e52c8f
	Library/metadata/a9/a9abfceecc3db44b9a3f426c95b7786c
	Library/metadata/ac/ac367411a033d4cb5b402fa6144f8250
	Library/metadata/ae/ae5295f7643be40f0b6da924cfbe89ed
	Library/metadata/b4/b451e7ef079a64b25835f7801a60da33
	Library/metadata/b4/b4567074cce5f432682c57e4e6b35403
	Library/metadata/b5/b5b9a79d74b264dcba7d4b8beaf5ff04
	Library/metadata/b7/b7aaa742b953147c2b33cc2d68b6c905
	Library/metadata/bb/bb4895ff08e3c4499b295eaccfe533ac
	Library/metadata/bc/bc03716e972674cdab33cbd61a72cf4f
	Library/metadata/bc/bc1c5369db641417cb508c6ac059f06a
	Library/metadata/bc/bc6d041f205e24d57a4431af2bd617b0
	Library/metadata/bf/bfa8b25d3b7f94dcaab986e9d8a62d4e
	Library/metadata/c0/c02275f29c6524d0c8e91bf5f60db781
	Library/metadata/c4/c4af3c205f9454438be22c3a061aca53
	Library/metadata/ca/ca4ffc59240f3448384e3b0a44c9d96b
	Library/metadata/ca/cab97e1b21fc147bfac21481d3387420
	Library/metadata/cd/cdb8e52cc98704418aadde5d336bf595
	Library/metadata/cf/cf53726df031d414980289b7680b94d5
	Library/metadata/cf/cfaf4dfe6de01424081040c051125c87
	Library/metadata/d0/d09634ea972304072a28ff4eae0bc23e
	Library/metadata/d1/d1140bd835e2e43248eafeb47b95c61c
	Library/metadata/d2/d26be30e5788e4eb1a710bbfd0356b36
	Library/metadata/d4/d4203a0f14a284315ad0b3d4281ee014
	Library/metadata/d6/d6f794ca40cbe4eab98594cd21a10edd
	Library/metadata/d7/d7c8535cc4f454abeb00c4f957338881
	Library/metadata/d8/d8bb0dbed09804f6bbb438404bb4917f
	Library/metadata/d9/d9ef5cb27e48f4735a134cae3a3d743e
	Library/metadata/da/da9ec1eea7884462893deb4a44d3f68d
	Library/metadata/db/dbf8d2a504e9541569c87efdc704d0a9
	Library/metadata/dc/dc402b4a5fd274b478cc8a74af314023
	Library/metadata/dc/dc5670c7ae64f41e69e5b1f3af830c8d
	Library/metadata/dc/dcd8ae0925f634e2ca59c37d999200b5
	Library/metadata/de/deb968c2295854cc0bd7cb3160800b2f
	Library/metadata/df/df9d86a50c79546e8a95a7ca7eb43af3
	Library/metadata/e1/e1d6c17423fbc41b085a1b7b5fcb430a
	Library/metadata/e2/e2df54d3d23a9417b8cf9b10917e67fb
	Library/metadata/e6/e601e79cf968f4ff080adee3fa627f1f
	Library/metadata/eb/eb9f6022f5e2a416aa4ab49df611442c
	Library/metadata/ed/ed2ba75a23ded428d8ca4a63febf35ca
	Library/metadata/f1/f1cc274a3e8f44c99a39560b1552e57c
	Library/metadata/f3/f384087e7f22f4f1da185345111ee7fe
	Library/metadata/f8/f8022056f9c22406081dfd3e66106cdf
	Library/metadata/fb/fb9b085f6471247bf859341e1e57cdca
	Library/metadata/fd/fd89309e31e27406f9c3a04c1e04843e
	Library/metadata/fd/fda4c7a3512d34f37aa397176e187625
	Library/metadata/fd/fdf7ead72b9db48c782ddb447c315d32
	Library/metadata/fe/feba1bba74143455487efcf93107b91a
	Library/metadata/ff/ffb5af09d0eaf46898e199d263caebac
added character face icons & pain indicator script
removed pain bar, added pain indicator, animals can change Y
integrating ambulance sprite into fainted menu
switching computers
switching computers
some net work

still thinking of a better system
change net launching slightly

no more parabolic motion, nets are now launched purely in the x-axis so
that the character’s postition can affect catching the animal. Also
reduction in the number of colliders an animal object has and simpler
net interaction, TODO: apply to all other animals, currently only
effective in crocodile
changing computers
switching
All 9 animals have prefabs, different net system
Merge branch 'master' into Ebby

Conflicts:
	Assets/Scenes/LevelFrame.unity
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.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/expandedItems
	Library/guidmapper
	Library/metadata/07/0740098c3f32a494090ba588266f0fe2
	Library/metadata/08/0820e73e1c3d540c594ed922c04cc1a1
	Library/metadata/15/15b64e13a5ce243aa9373fc1b355e694
	Library/metadata/18/184a5ad876b9b4687bbd2c7bed4213a6
	Library/metadata/23/2373bbc3a13d349579d05475be48fd11
	Library/metadata/30/302a61e28ecf94f0cb6a34f6dd41628e
	Library/metadata/58/586caf85dc56145c984e81d4142469a6
	Library/metadata/61/61758d29a3e484db69b60b99e07ca6fd
	Library/metadata/64/64687af1e761f4c4d9cb76bad0c95c7f
	Library/metadata/66/6656012c107a043318e2d5e99f45b6eb
	Library/metadata/6e/6ed659650684a474cb316ce46bc856f0
	Library/metadata/71/71ee99c0b729441b9917560891a4cb93
	Library/metadata/83/838942c00b1bb4b2b9d716d369a75063
	Library/metadata/93/9314d75fdf7fd436cae93d948e44a6cd
	Library/metadata/a2/a2ddca3e6c5c14633a24ee53106c58e1
	Library/metadata/bc/bc1c5369db641417cb508c6ac059f06a
	Library/metadata/be/be1d684556fa045f99461a9f7aa1cad3
	Library/metadata/c1/c17f387a9eb7645e083b0c4c25bcc43f
	Library/metadata/cd/cdb8e52cc98704418aadde5d336bf595
	Library/metadata/d0/d09634ea972304072a28ff4eae0bc23e
	Library/metadata/d7/d7c8535cc4f454abeb00c4f957338881
	Library/metadata/de/deb968c2295854cc0bd7cb3160800b2f
	Library/metadata/df/df9d86a50c79546e8a95a7ca7eb43af3
	Library/metadata/fb/fb9b085f6471247bf859341e1e57cdca
	Library/metadata/fd/fd89309e31e27406f9c3a04c1e04843e
	Library/metadata/fd/fda4c7a3512d34f37aa397176e187625
	Library/metadata/ff/ffb5af09d0eaf46898e199d263caebac
	ZooRush-beta-csharp.sln
	ZooRush-beta.sln
finalizing merge with master
Merge pull request #54 from ebbyw/Ebby

Ebby