Ignore this
Merge branch 'master' of https://github.com/trikeman/IntermediateGame

Conflicts:
	ProjectEcco/Assembly-CSharp-firstpass-vs.csproj
	ProjectEcco/Assembly-CSharp-firstpass.csproj
	ProjectEcco/Assembly-CSharp-firstpass.pidb
	ProjectEcco/Assembly-CSharp-vs.csproj
	ProjectEcco/Assembly-CSharp.csproj
	ProjectEcco/Assembly-CSharp.pidb
	ProjectEcco/Assembly-UnityScript-firstpass-vs.unityproj
	ProjectEcco/Assembly-UnityScript-firstpass.pidb
	ProjectEcco/Assembly-UnityScript-firstpass.unityproj
	ProjectEcco/Library/AssetServerCacheV3
	ProjectEcco/Library/InspectorExpandedItems.asset
	ProjectEcco/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	ProjectEcco/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	ProjectEcco/Library/ScriptAssemblies/Assembly-CSharp.dll
	ProjectEcco/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	ProjectEcco/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll

ProjectEcco/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.
mdb
	ProjectEcco/Library/ScriptMapper
	ProjectEcco/Library/assetDatabase3
	ProjectEcco/Library/expandedItems
	ProjectEcco/Library/guidmapper
	ProjectEcco/Library/metadata/00/00000000000000002000000000000000
	ProjectEcco/Library/metadata/00/00000000000000003000000000000000
	ProjectEcco/Library/metadata/00/00000000000000004000000000000000
	ProjectEcco/Library/metadata/00/00000000000000004100000000000000
	ProjectEcco/Library/metadata/00/00000000000000005000000000000000
	ProjectEcco/Library/metadata/00/00000000000000006000000000000000
	ProjectEcco/Library/metadata/00/00000000000000006100000000000000
	ProjectEcco/Library/metadata/00/00000000000000007000000000000000
	ProjectEcco/Library/metadata/00/00000000000000008000000000000000
	ProjectEcco/Library/metadata/00/00000000000000009000000000000000
	ProjectEcco/Library/metadata/00/0000000000000000a000000000000000
	ProjectEcco/Library/metadata/00/0000000000000000b000000000000000
	ProjectEcco/Library/metadata/00/0000000000000000c000000000000000
	ProjectEcco/Library/metadata/00/0050470914ec34c44806fa44b103bbcb
	ProjectEcco/Library/metadata/01/01174e4954348268c150b6f98c48939f
	ProjectEcco/Library/metadata/01/018213b6927a84f61b285ef41d62a672
	ProjectEcco/Library/metadata/01/01b622d4830754f4886f4b03606fb1ec
	ProjectEcco/Library/metadata/02/028c11450244e4feabe6828fc2ec3e03
	ProjectEcco/Library/metadata/05/054a31a99d11e49d110086ba44295342
	ProjectEcco/Library/metadata/06/06df7e2694f5f491ebb1ae08b112dc60
	ProjectEcco/Library/metadata/08/086544326e5604e81a96f61fb0f0a78e
	ProjectEcco/Library/metadata/08/0878cc50d135048b3a015413ad06033b
	ProjectEcco/Library/metadata/08/08f28e42a647e2a4cbd32e793359aa3c
	ProjectEcco/Library/metadata/0a/0a70c16c7b47ab048bc9e03b588c24f6
	ProjectEcco/Library/metadata/0a/0ab79d7f243824f5d9826bd83522c8df
	ProjectEcco/Library/metadata/0d/0dae889a1029544ff9be45a5b3308c5f
	ProjectEcco/Library/metadata/0f/0f55f8a0f599a4cb2bccff824a1265ff
	ProjectEcco/Library/metadata/10/10881c868f3e746c9916039b9c75208e
	ProjectEcco/Library/metadata/12/12747bdca86d344c2a4f1ea2bb362f17
	ProjectEcco/Library/metadata/14/144b203f383094d16b1f336c74c47326
	ProjectEcco/Library/metadata/16/169b10ce10f4327cb9f40f6b117ed8d7
	ProjectEcco/Library/metadata/17/17606a15dc01c43f597f7c5267cc2904
	ProjectEcco/Library/metadata/1a/1a5d8cd24a805cd44b00c7f1e1e4d287
	ProjectEcco/Library/metadata/1a/1a6506345bb4c425099c20b3d46d647d
	ProjectEcco/Library/metadata/1d/1d5ac211a643e447ca78c2d794a16381
	ProjectEcco/Library/metadata/1f/1ff5acd3fcc1641108df6556c418688c
	ProjectEcco/Library/metadata/21/215977489d11178d11005b9844295342
	ProjectEcco/Library/metadata/21/21e9454763a4d4b4c9f05321ce1ad128
	ProjectEcco/Library/metadata/23/2314ce3a3eecf4816bad3c9eca4de2e1
	ProjectEcco/Library/metadata/23/23bdc29df998a496aa3d120f7c4ab738
	ProjectEcco/Library/metadata/27/2795ab84e4acb4fb786c94e86608a885
	ProjectEcco/Library/metadata/27/27e025c0e2dd14a3f9edb8f8856cec59
	ProjectEcco/Library/metadata/28/283e99c3cf8d54a4c879c6f6a7ebf9c2
	ProjectEcco/Library/metadata/29/29a3a0b5b3fee4202bd1331d3c28e2ed
	ProjectEcco/Library/metadata/29/29db5f9ff2aa54440a3a29ca471cfd8d
	ProjectEcco/Library/metadata/29/29f2844e1d89a4ed09e527cd2039d6ea
	ProjectEcco/Library/metadata/2a/2a49aa5b76842305fc65897abcdcf30f
	ProjectEcco/Library/metadata/2a/2acf9c8e812eff6459715d2b3dce2c96
	ProjectEcco/Library/metadata/2b/2b21364bb71d4eb4dbce6894c82cd119
	ProjectEcco/Library/metadata/2c/2ceadc64287b0491a93137928f66566e
	ProjectEcco/Library/metadata/2d/2d7d86c34e7228949bb5e2781c0ca2f6
	ProjectEcco/Library/metadata/2f/2f6d31b6f9d664e448b9bc65603df5f0
	ProjectEcco/Library/metadata/2f/2fb7e3a8a69cf4e18be89bb038fd50ee
	ProjectEcco/Library/metadata/30/3004ecc275b79844a95978dc9ea13b96
	ProjectEcco/Library/metadata/32/327835a878f496675e402fdba3e0a4bc
	ProjectEcco/Library/metadata/33/338388da42138436f9581947cbe06e3e
	ProjectEcco/Library/metadata/34/34c9fcec00ce63b49a6725d4eadead19
	ProjectEcco/Library/metadata/39/393a884dce4a83c499e63f4a631e89bf
	ProjectEcco/Library/metadata/3b/3b413f5c50808499a8fbd4cf898b52a1
	ProjectEcco/Library/metadata/3d/3dc46d473de9b45d7bbb3a6c0d5ff84a
	ProjectEcco/Library/metadata/3d/3ddb50e323b793449ad89bd605735e35
	ProjectEcco/Library/metadata/3f/3fbc34d51ee4155dc17d8f49133f44ad
	ProjectEcco/Library/metadata/42/428c7ceda4b1a41a08972b4f8afd1da6
	ProjectEcco/Library/metadata/44/4459d876ebdd34c659b6d90cd1daf3d6
	ProjectEcco/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	ProjectEcco/Library/metadata/44/44b3febaf5142a5429938ef0a0de2395
	ProjectEcco/Library/metadata/48/48dca5b99d113b8d11006bab44295342
	ProjectEcco/Library/metadata/4a/4a056241e2722dc46a7262a8e7073fd9
	ProjectEcco/Library/metadata/4b/4b31b1caadab1ee4b8606c9f35713992
	ProjectEcco/Library/metadata/4d/4d3e1fa468d2041a3950775aa0359261
	ProjectEcco/Library/metadata/4e/4ef72c1e4ea654a7c983318ad30335e9
	ProjectEcco/Library/metadata/4e/4efe5620a91cf9542993ee04a027a7f5
	ProjectEcco/Library/metadata/51/511256687f20d408e9a5bb944e3a05d2
	ProjectEcco/Library/metadata/51/513aa36c8fee24b1e876609b93bff179
	ProjectEcco/Library/metadata/51/5171eceebc1b34f47b232e935c51cd1c
	ProjectEcco/Library/metadata/51/51bc4b9490336194ea3a8f930f8616c5
	ProjectEcco/Library/metadata/53/531c14f8d5cdc4e5baa83ee6e16f783a
	ProjectEcco/Library/metadata/54/5410a64fad11e8d6d00011d98d76c639
	ProjectEcco/Library/metadata/54/542f86e4e34b523499e0f073b1355e1a
	ProjectEcco/Library/metadata/55/554f9932c5f0a4449b18fc0b4415d854
	ProjectEcco/Library/metadata/56/5692846c5ce8f4ee08ef64bec4aad0bd
	ProjectEcco/Library/metadata/57/574a6dc4ee8c6442896788b4daff207b
	ProjectEcco/Library/metadata/57/57e40ec2d362b455789ac194ca0c9930
	ProjectEcco/Library/metadata/57/57f8742e03ecf1849b802d820ac6c945
	ProjectEcco/Library/metadata/58/5846b5686bbcf47ae89b56682a0361fd
	ProjectEcco/Library/metadata/5a/5a09dad89d11389ed000e82b8d76c639
	ProjectEcco/Library/metadata/5a/5a46e8af33f0b4da3a485152fe9023a3
	ProjectEcco/Library/metadata/5b/5b4d8d5bd0b1d414d8899859fcc79fda
	ProjectEcco/Library/metadata/5c/5c5207be06c988b40ab2fd2ce10ee525
	ProjectEcco/Library/metadata/5c/5c54115eb5a2a4c4fb1b11b8e6100bd8
	ProjectEcco/Library/metadata/5d/5d69df9d9d11e49d110086ba44295342
	ProjectEcco/Library/metadata/5e/5e63a2e845f27634d8d060424f041d94
	ProjectEcco/Library/metadata/60/60bca8f58a0b8478e946e6e86658cb29
	ProjectEcco/Library/metadata/60/60fb16895cbaf4946906b6d63f3653ec
	ProjectEcco/Library/metadata/62/62f7c8a57ece2204695f3c7dc963d23c
	ProjectEcco/Library/metadata/64/642367443312c224bb40c297365867ac
	ProjectEcco/Library/metadata/65/6523b1a485cb2447da31046f81088922
	ProjectEcco/Library/metadata/65/65836931803ab5b4fb9f60bd418f4100
	ProjectEcco/Library/metadata/65/65fb74f285bbb4d11a3b64d99c0a53b0
	ProjectEcco/Library/metadata/66/664f00d2f229f44b3b3f43bfde07420d
	ProjectEcco/Library/metadata/66/66e0989f9d113e2d110016e844295342
	ProjectEcco/Library/metadata/67/6793afeb1ba524134ae93ee3038763e0
	ProjectEcco/Library/metadata/67/67db31eead11e8d6d00011d98d76c639
	ProjectEcco/Library/metadata/68/68ec2fe99d1108b9d0006a298d76c639
	ProjectEcco/Library/metadata/6b/6b39e10e2dd144d628fa01e34933b8b6
	ProjectEcco/Library/metadata/6b/6bd498450cecf42b48182458ad793f33
	ProjectEcco/Library/metadata/6c/6c4778819de0e47e389386d7a9f30ce4
	ProjectEcco/Library/metadata/6e/6e77d387966489d6cb6bb6ba39e09c45
	ProjectEcco/Library/metadata/6e/6e9319c5aed3f4419a14d17b87181c56
	ProjectEcco/Library/metadata/72/7260045291a244dd3bb638fe7b59cc72
	ProjectEcco/Library/metadata/72/72d21eb476a2543d99355851c34ef87d
	ProjectEcco/Library/metadata/73/73d34ef0bd7074b359897c3bcd4a71d5
	ProjectEcco/Library/metadata/74/74bcba72c2286ce429281c86d5928418
	ProjectEcco/Library/metadata/74/74f4a47fc3b034e2d963491f4e514174
	ProjectEcco/Library/metadata/79/79b033e52a7ed41f3b9e20e87948a55d
	ProjectEcco/Library/metadata/79/79ee47d0d7d8347459a63ae804788244
	ProjectEcco/Library/metadata/7a/7a598717ded698c4dbdd57c2260fa1e1
	ProjectEcco/Library/metadata/7a/7ad57ed33939840dd9e823f48e32e0d1
	ProjectEcco/Library/metadata/7b/7b277829b0b4991f100024a80dbc5c14
	ProjectEcco/Library/metadata/7c/7c98ffa948c8d43d5ac42a3e9f0ea897
	ProjectEcco/Library/metadata/7d/7dca5dff796eb47908302d505dcb19b0
	ProjectEcco/Library/metadata/7e/7e31f8aa55b994d6395a7ad30934c6bf
	ProjectEcco/Library/metadata/7e/7e3669cf306c78f48a1f9affe08eb0f9
	ProjectEcco/Library/metadata/7e/7ef2338c8ac704435a1ddacd43d2e528
	ProjectEcco/Library/metadata/80/80933b223d6084ed8a2174281d3fb7a5
	ProjectEcco/Library/metadata/81/817badd8ea9bf427dbd1d61e678bb6c1
	ProjectEcco/Library/metadata/82/820a38890d8f1f742b289b29927ffb3b
	ProjectEcco/Library/metadata/82/827f8d1d5e93244c29eed187bb0db56f
	ProjectEcco/Library/metadata/83/8306ec4ada7164253ab10733f03de5e6
	ProjectEcco/Library/metadata/83/83fd4ccf0d21f46a3a7f64df7640eef7
	ProjectEcco/Library/metadata/84/845ee02f774df4c96997e3ea0471dac6
	ProjectEcco/Library/metadata/84/84b9e1d19d11078d11005b9844295342
	ProjectEcco/Library/metadata/85/85ca864dc83fb42ccb7c9e706c02606c
	ProjectEcco/Library/metadata/86/8600316ae23e146108aa156f81a2d56f
	ProjectEcco/Library/metadata/87/8774e050b0cd8452cab8f26617d11195
	ProjectEcco/Library/metadata/87/87a0005e79f17459597bd4325eb570c8
	ProjectEcco/Library/metadata/88/88324f760c579473199bfbc4f1073097
	ProjectEcco/Library/metadata/8d/8d76641f3a4ce4e2996ef6dc6a604ddf
	ProjectEcco/Library/metadata/8e/8e303788a4e296443b33942a5be85049
	ProjectEcco/Library/metadata/8e/8e3ff3e27ca4bc54dda56e89e0550dfa
	ProjectEcco/Library/metadata/8e/8e994b7e650a342d99dd5968dea53b5e
	ProjectEcco/Library/metadata/92/921e6c1bf3828ce4db444914cdc3abf4
	ProjectEcco/Library/metadata/92/92e6d9926a8c43d49a79f0d3d603277a
	ProjectEcco/Library/metadata/95/95c6f276745f54c9e9af61a55a7166c8
	ProjectEcco/Library/metadata/96/96558d9af5ccba84da0a06dc9afa072d
	ProjectEcco/Library/metadata/97/97275b80c2a4244988ae0090ebd9cbfa
	ProjectEcco/Library/metadata/97/97b050d43ac7c4d2b9f6cbb587650761
	ProjectEcco/Library/metadata/97/97be4e1dfc9004baa9f819967957f89d
	ProjectEcco/Library/metadata/99/99e86ee0ad11f8d6d00011d98d76c639
	ProjectEcco/Library/metadata/9a/9a73989cde3164a1b91eed1becf7d2d0
	ProjectEcco/Library/metadata/9c/9c5bd6070cd5d481abdb8755ff51fd7a
	ProjectEcco/Library/metadata/9c/9c7f793f82a4f7bda3662a9a2f23142e
	ProjectEcco/Library/metadata/9c/9ce107479d11178d11005b9844295342
	ProjectEcco/Library/metadata/9d/9d4133d5d30b644bd87802a347eaccbe
	ProjectEcco/Library/metadata/a2/a28540d6bcf674c1bb3dd7af7de640fc
	ProjectEcco/Library/metadata/a2/a2c2ed5a68582344f99fe7797f02cf0e
	ProjectEcco/Library/metadata/a3/a333dc6abda624ef889bd54b285fb045
	ProjectEcco/Library/metadata/ab/abe904022f340f54f89bda9ba8252e5e
	ProjectEcco/Library/metadata/ac/acd22cefe09441d2c7e801193b935495
	ProjectEcco/Library/metadata/ad/ad90f586d4fe1b942b46f0da520a0e61
	ProjectEcco/Library/metadata/af/af4465c7aa1400a6573c907831d716c9
	ProjectEcco/Library/metadata/b4/b42033e5255a64aebba0322029f47dcd
	ProjectEcco/Library/metadata/b9/b995d4bd9d11078d11005b9844295342
	ProjectEcco/Library/metadata/b9/b9a268fc98c474f721ff8c9bf8f5160e
	ProjectEcco/Library/metadata/bb/bb393e804ad0e204cb1fcfbc9b8b0409
	ProjectEcco/Library/metadata/bb/bb9bf1ecb5a76fd4fb09cd101b948bff
	ProjectEcco/Library/metadata/bd/bd84abdd9cd1149b986afb3e37552686
	ProjectEcco/Library/metadata/bd/bd943c792514675e464dfc7a8c26d3e0
	ProjectEcco/Library/metadata/be/be5275070a47e4598b9932d69c1a20df
	ProjectEcco/Library/metadata/be/beca0416736fdf94194b98f2cc8a2bb0
	ProjectEcco/Library/metadata/c2/c2e2b29379f604cf3a73b1e0796b9e12
	ProjectEcco/Library/metadata/c3/c31fa1a55f0c141ccb34e61d6bb78569
	ProjectEcco/Library/metadata/c5/c5ce822ffd6f24d70839f942d24d7bfd
	ProjectEcco/Library/metadata/c6/c61bcdcd673884422be5a3a65708ac92
	ProjectEcco/Library/metadata/c6/c6c20bd0ab9a84dba8a7d580a9c19b21
	ProjectEcco/Library/metadata/c7/c78b114ae617a4914a6f9b9e0f796a0b
	ProjectEcco/Library/metadata/c9/c994fde8e6848a3771503f184e0c9cb4
	ProjectEcco/Library/metadata/c9/c99d9008ca9c52f4e9953c345cb7cfe2
	ProjectEcco/Library/metadata/c9/c9e6294c9d11cb8d11006bf944295342
	ProjectEcco/Library/metadata/ca/ca49380a71a2bb64c830d06bd421b9d1
	ProjectEcco/Library/metadata/ca/caf20877f7cce4351a9b1cfef8dcd186
	ProjectEcco/Library/metadata/cc/cc4c9f370043b40808167272fbceaa52
	ProjectEcco/Library/metadata/cd/cdf7d3f1ad11f8d6d00011d98d76c639
	ProjectEcco/Library/metadata/ce/ce96720ae245f474eaaaeee13b7b4c27
	ProjectEcco/Library/metadata/d0/d02462ca660464132ac36d996f54f6f5
	ProjectEcco/Library/metadata/d2/d236c2e07976ff942a0e23d979e8f4cb
	ProjectEcco/Library/metadata/d3/d3b7d84ffb95cc04aaeb74f19a10f034
	ProjectEcco/Library/metadata/d3/d3e0fd2f5f9244f8ca38e0214ad455ac
	ProjectEcco/Library/metadata/d4/d4ae4740f48884e7cb03e072f74b74f9
	ProjectEcco/Library/metadata/d5/d51192b43172241ac9b491f25c6eefd9
	ProjectEcco/Library/metadata/d6/d607c8e212d6b40eab5d887af10a0a5c
	ProjectEcco/Library/metadata/d8/d84268709d11078d11005b9844295342
	ProjectEcco/Library/metadata/da/da93ddd6928094e24bb1f3f665f143d3
	ProjectEcco/Library/metadata/da/dad51b394a7b64482bf6ba3d67ca1185
	ProjectEcco/Library/metadata/de/ded4ef7d67c1a4b1ba310983ace9dfad
	ProjectEcco/Library/metadata/df/df587060d79ea4b038faa0428404c062
	ProjectEcco/Library/metadata/e0/e097e0ca551c28647a5a126e44c35bbc
	ProjectEcco/Library/metadata/e1/e11aa2de4900741e5b03a4d9bc78f0d3
	ProjectEcco/Library/metadata/e2/e2b92b849bb814d11afabba7c392a8bf
	ProjectEcco/Library/metadata/e3/e3d42414677befb458487d47dc13750b
	ProjectEcco/Library/metadata/e4/e4e4cff51dff43545953848c2258e62c
	ProjectEcco/Library/metadata/e5/e550b39bc10b9814685d6716fc1a5a86
	ProjectEcco/Library/metadata/e6/e60501dd5a0674176b38c6468bbe82f9
	ProjectEcco/Library/metadata/e6/e667992b28845df99060a8f876d1d11b
	ProjectEcco/Library/metadata/e7/e784446f465094d028f5360cb5f4b6ce
	ProjectEcco/Library/metadata/e7/e79b4ee3b7b31ee499b1532270c7730d
	ProjectEcco/Library/metadata/e7/e7d408c28925be148bd9ef32f4f28e44
	ProjectEcco/Library/metadata/e8/e83c2f831bb0fd14b92751cdcbe823ec
	ProjectEcco/Library/metadata/e9/e976c6d3ebc1e4a85aa7186a3192d8c5
	ProjectEcco/Library/metadata/ec/ec33b0da4b66c41bd9a0946d7cf5cb8c
	ProjectEcco/Library/metadata/f3/f3d66f34459704a34b36657da3964ea1
	ProjectEcco/Library/metadata/f3/f3e08c18f8a324c9c918ece73cb35129
	ProjectEcco/Library/metadata/f4/f4616cc9c6af5d24495fbf1c339865a1
	ProjectEcco/Library/metadata/f6/f60723ea36fc34476899abc83a5309c9
	ProjectEcco/Library/metadata/f7/f72542287af724fb9a6c311d7435975c
	ProjectEcco/Library/metadata/f8/f89a53f13e64bbbd73bd6eb9f8509a09
	ProjectEcco/Library/metadata/f8/f8f44309446754e2e933c20ff8b28f76
	ProjectEcco/Library/metadata/fa/fa9a139ead11e8d6d00011d98d76c639
	ProjectEcco/Library/metadata/fb/fb26ba8b5ff0b7d4284cf09c13cb567f
	ProjectEcco/Library/metadata/fb/fba6a88cf39fe45388f621313e8077fd
	ProjectEcco/Library/metadata/fc/fcb49e385597b4f46bd625d40f3741cf
	ProjectEcco/Library/metadata/fe/fe98eda21cce34c2ba59f5f54aca9468
	ProjectEcco/ProjectEcco-csharp.sln
	ProjectEcco/ProjectEcco.sln
	ProjectEcco/ProjectEcco.userprefs