build forest :) areas
Merge branch 'master' of https://github.com/Undiscovered-Game-Studios/Project-Legacy-2D

Conflicts:
	Project Legacy 2D/Assembly-CSharp-Editor-vs.csproj
	Project Legacy 2D/Assembly-CSharp-Editor.csproj
	Project Legacy 2D/Assembly-CSharp-firstpass-vs.csproj
	Project Legacy 2D/Assembly-CSharp-firstpass.csproj
	Project Legacy 2D/Assembly-CSharp-vs.csproj
	Project Legacy 2D/Assembly-CSharp.csproj
	Project Legacy 2D/Assembly-UnityScript-firstpass-vs.unityproj
	Project Legacy 2D/Assembly-UnityScript-firstpass.unityproj
	Project Legacy 2D/Assets/Tiled2Unity.meta
	Project Legacy 2D/Assets/Tiled2Unity/Imported.meta
	Project Legacy 2D/Assets/Tiled2Unity/Materials.meta
	Project Legacy 2D/Assets/Tiled2Unity/Materials/dirt.mat
	Project Legacy 2D/Assets/Tiled2Unity/Materials/dirt.mat.meta
	Project Legacy 2D/Assets/Tiled2Unity/Materials/water.mat
	Project Legacy 2D/Assets/Tiled2Unity/Materials/water.mat.meta
	Project Legacy 2D/Assets/Tiled2Unity/Meshes.meta
	Project Legacy 2D/Assets/Tiled2Unity/Prefabs.meta
	Project Legacy 2D/Assets/Tiled2Unity/Scripts.meta
	Project Legacy 2D/Assets/Tiled2Unity/Scripts/Editor.meta
	Project Legacy 2D/Assets/Tiled2Unity/Scripts/Runtime.meta
	Project Legacy 2D/Assets/Tiled2Unity/Shaders.meta
	Project Legacy 2D/Assets/Tiled2Unity/Textures.meta
	Project Legacy 2D/Assets/Tiled2Unity/Textures/dirt.png.meta
	Project Legacy 2D/Assets/Tiled2Unity/Textures/water.png.meta
	Project Legacy 2D/Library/AssetServerCacheV3
	Project Legacy 2D/Library/CurrentLayout.dwlt
	Project Legacy 2D/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Project Legacy 2D/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project Legacy 2D/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project Legacy 2D/Library/ScriptMapper
	Project Legacy 2D/Library/assetDatabase3
	Project Legacy 2D/Library/expandedItems
	Project Legacy 2D/Library/guidmapper
	Project Legacy 2D/Library/metadata/00/00000000000000002000000000000000
	Project Legacy 2D/Library/metadata/00/00000000000000003000000000000000
	Project Legacy 2D/Library/metadata/00/00000000000000004000000000000000
	Project Legacy 2D/Library/metadata/00/00000000000000004100000000000000
	Project Legacy 2D/Library/metadata/00/00000000000000005000000000000000
	Project Legacy 2D/Library/metadata/00/00000000000000005100000000000000
	Project Legacy 2D/Library/metadata/00/00000000000000006000000000000000
	Project Legacy 2D/Library/metadata/00/00000000000000006100000000000000
	Project Legacy 2D/Library/metadata/00/00000000000000007000000000000000
	Project Legacy 2D/Library/metadata/00/00000000000000008000000000000000
	Project Legacy 2D/Library/metadata/00/00000000000000009000000000000000
	Project Legacy 2D/Library/metadata/00/0000000000000000a000000000000000
	Project Legacy 2D/Library/metadata/00/0000000000000000b000000000000000
	Project Legacy 2D/Library/metadata/00/0000000000000000c000000000000000
	Project Legacy 2D/Library/metadata/00/0078a9f149ccfb94aaa594f373adc56d
	Project Legacy 2D/Library/metadata/01/019126fb433a06b41a9d8ad7e82fb702
	Project Legacy 2D/Library/metadata/03/038c46416cc18c6498e2955822f4d877
	Project Legacy 2D/Library/metadata/05/054a31a99d11e49d110086ba44295342
	Project Legacy 2D/Library/metadata/0a/0a0517c8f07c047f2965315b8dac81aa
	Project Legacy 2D/Library/metadata/0a/0a4b0bce1e250a14bb534d70bce205fa
	Project Legacy 2D/Library/metadata/0b/0b8d27be845dcc048a90eeb2e55bf5f7
	Project Legacy 2D/Library/metadata/0d/0d64cf85603324c6d89204084bbb3438
	Project Legacy 2D/Library/metadata/10/10268143bcae72d4e8fc4274d39f78b7
	Project Legacy 2D/Library/metadata/15/1553d77f542284c478caca3b413d7c6a
	Project Legacy 2D/Library/metadata/18/1874989c5e2da094ea00112c6a895694
	Project Legacy 2D/Library/metadata/18/18df468ae4f49494cb050fb7b925cf0d
	Project Legacy 2D/Library/metadata/1b/1bf34b610fe6f466faff3dcd833c06f6
	Project Legacy 2D/Library/metadata/1e/1e3cbdfe3644f44aeb1c053d96cc254e
	Project Legacy 2D/Library/metadata/1e/1edfae5c7fc834f76b77bee26e88e0a4
	Project Legacy 2D/Library/metadata/24/24f8b7f726c7047cb906be889dbf5ac1
	Project Legacy 2D/Library/metadata/25/253d6a098db104045b05128f90fdf712
	Project Legacy 2D/Library/metadata/27/2701c188f5d135944b3731fff08a8a74
	Project Legacy 2D/Library/metadata/2b/2b382c059b23e074fb9415cac425ca6c
	Project Legacy 2D/Library/metadata/2f/2fd60b04f7c434a4dafd253d09bfa783
	Project Legacy 2D/Library/metadata/31/31f6763de0920574092c8a69a66c717e
	Project Legacy 2D/Library/metadata/33/3357eb1647e46cc4f90e3da12c5dc2ae
	Project Legacy 2D/Library/metadata/33/33850b67ffcaa4b6c9a7146e4be0b917
	Project Legacy 2D/Library/metadata/35/356d385a59c53487ebe6e3363ff4ffa2
	Project Legacy 2D/Library/metadata/36/362b591357bb0144c993ca643ae5797d
	Project Legacy 2D/Library/metadata/39/3954501323f24464f9e4418c78d8e8ce
	Project Legacy 2D/Library/metadata/3c/3c5bb2bad5622497490fdbd0f36e9674
	Project Legacy 2D/Library/metadata/3c/3cadc5c144b6941fd9b94e6f6cbaa3cc
	Project Legacy 2D/Library/metadata/40/403fe00d5d89d3540aa8eca15443ad92
	Project Legacy 2D/Library/metadata/40/40b01469ebddf42bc84870ba2f3d8c4c
	Project Legacy 2D/Library/metadata/46/46e871058d317418fab60bb84a290869
	Project Legacy 2D/Library/metadata/48/48dca5b99d113b8d11006bab44295342
	Project Legacy 2D/Library/metadata/49/496478de58fac2146bc6f4b246633cff
	Project Legacy 2D/Library/metadata/4c/4ca8e16c3e0ab45e69aef7738ef77d3a
	Project Legacy 2D/Library/metadata/4d/4d48bf87d37b5442bb9d7f5c4f3f6ff7
	Project Legacy 2D/Library/metadata/4e/4e14399bfbcbf624eaccefa8c59cf680
	Project Legacy 2D/Library/metadata/4e/4e3101939751ddb4abc3143c5758d275
	Project Legacy 2D/Library/metadata/4f/4fa37a82238b5ac4fafff7138fe8c42e
	Project Legacy 2D/Library/metadata/51/510306bf62c654a548c9d0193dbedd8e
	Project Legacy 2D/Library/metadata/52/527393b10fb66418bbaa072e104f5a30
	Project Legacy 2D/Library/metadata/54/54216e9ed42974e30967824b7f0b2806
	Project Legacy 2D/Library/metadata/55/5511954f42feaa54aa0417568c30d838
	Project Legacy 2D/Library/metadata/57/5710a1f47af2947699139509aae39149
	Project Legacy 2D/Library/metadata/5f/5f32776e6f3e6464191e1cc146b4eaf5
	Project Legacy 2D/Library/metadata/60/607426a9820414bfd8081fb22854dbd4
	Project Legacy 2D/Library/metadata/61/6134a184b1d49498fb473b6276533784
	Project Legacy 2D/Library/metadata/63/63e618e4b55634c8fb3bf5c5cd6679ea
	Project Legacy 2D/Library/metadata/65/651770f8be26443fdb85aa3594fa349c
	Project Legacy 2D/Library/metadata/66/6685d213dcd37451eaa7643f63089046
	Project Legacy 2D/Library/metadata/66/66e0989f9d113e2d110016e844295342
	Project Legacy 2D/Library/metadata/68/68e2b4b78992ac44eb605bc3173f2bb8
	Project Legacy 2D/Library/metadata/69/692d7db841cbe2b44b23d0a520ba230b
	Project Legacy 2D/Library/metadata/70/706eadfad28bc4c1c9bb137b31052b14
	Project Legacy 2D/Library/metadata/70/70a4c3571f5624280bd8605def97056d
	Project Legacy 2D/Library/metadata/73/73604ae94aea741dfa9b7732c8994b19
	Project Legacy 2D/Library/metadata/79/794a3489a6afd4daf80d98a5844341b9
	Project Legacy 2D/Library/metadata/7c/7c864f8b9c1c9d84f9567cf58a1111c7
	Project Legacy 2D/Library/metadata/7e/7e0b0a994d8934541a387e092630b5db
	Project Legacy 2D/Library/metadata/7e/7e6f84bf81c8d4de280f1133cff7e601
	Project Legacy 2D/Library/metadata/85/85cde262bee344ae28a0bf86762219ac
	Project Legacy 2D/Library/metadata/86/8636e662e0f7d440fa257e9dce592504
	Project Legacy 2D/Library/metadata/86/8668f96cc207b4965afadab0edade16a
	Project Legacy 2D/Library/metadata/8a/8af0f21f411904d65a90f87110818a7e
	Project Legacy 2D/Library/metadata/8c/8c1f929571ef549619212d9405d4f923
	Project Legacy 2D/Library/metadata/8c/8c75dadc1f18e42f5be29942a71d83c4
	Project Legacy 2D/Library/metadata/92/92722830d4a3f49e5bf7e68441337edb
	Project Legacy 2D/Library/metadata/97/97593109f34de48109618fb5687a88b8
	Project Legacy 2D/Library/metadata/9a/9a59d4872d73b416f8e0c2c4ca57fbe2
	Project Legacy 2D/Library/metadata/9b/9b9106e5cf82342e78e4fcc288becd41
	Project Legacy 2D/Library/metadata/9c/9ce107479d11178d11005b9844295342
	Project Legacy 2D/Library/metadata/9d/9dccc8e8f0da4494991c26ef59019551
	Project Legacy 2D/Library/metadata/9e/9ef50104b12ed4ca9bed40f105986cd7
	Project Legacy 2D/Library/metadata/9f/9fadc0eecbffa4c95a05ce54af27726c
	Project Legacy 2D/Library/metadata/9f/9fe289724d3bde84db9499fa9efd524c
	Project Legacy 2D/Library/metadata/aa/aadd99b5f57c2486b98d31bcbb5c640e
	Project Legacy 2D/Library/metadata/ab/ab70c098a52a04be88096d20e1540cb8
	Project Legacy 2D/Library/metadata/ab/ab90c5d984b4d4e9e935ae8760fd47ef
	Project Legacy 2D/Library/metadata/ac/ac85670a1b2274f22905d6a43940371a
	Project Legacy 2D/Library/metadata/ac/ac865f55780124eeabc4a99d6d0b0115
	Project Legacy 2D/Library/metadata/ac/ac96f5c0b697340a887ac2bd77a0bddc
	Project Legacy 2D/Library/metadata/ad/adec466a1f9044ea78471a5ce6f78271
	Project Legacy 2D/Library/metadata/b3/b365e6042890d4b1987423ed6bb8a08c
	Project Legacy 2D/Library/metadata/b7/b7b4d46ae2ac0ff449c02180209eea5d
	Project Legacy 2D/Library/metadata/bc/bc1708268dbea48479bdba97c9c6c6d5
	Project Legacy 2D/Library/metadata/bc/bc7077059ece49245b0f1d58bb86b6d9
	Project Legacy 2D/Library/metadata/c3/c3c027b73c9a8f342b1004593f39e817
	Project Legacy 2D/Library/metadata/c4/c48f755640f4048aeaa765302f0c14b3
	Project Legacy 2D/Library/metadata/c8/c81df2918c80c054ca3d436e62090893
	Project Legacy 2D/Library/metadata/c8/c8e96a067d1ef4982b454cf5a686f648
	Project Legacy 2D/Library/metadata/ca/caa1ec025a7c049ec8f67b889fb33a6d
	Project Legacy 2D/Library/metadata/ca/cad4fe3deabb0452e9a372244c25287c
	Project Legacy 2D/Library/metadata/cb/cb932b64443cf1c4b97dc192ab3a443e
	Project Legacy 2D/Library/metadata/cb/cba4562cece794697b418ce8e7c04b3c
	Project Legacy 2D/Library/metadata/cc/cc64992f6f660da46a4e636d2d96eeac
	Project Legacy 2D/Library/metadata/d2/d238579908a3647dfa39bc12a72393e7
	Project Legacy 2D/Library/metadata/d5/d5396a3251db948279e0c7262385dafe
	Project Legacy 2D/Library/metadata/d6/d6e9ebdf870a484449c2a925c5d5892e
	Project Legacy 2D/Library/metadata/d8/d84268709d11078d11005b9844295342
	Project Legacy 2D/Library/metadata/d8/d8cfa4746d26d4715b9f848bce1e2f14
	Project Legacy 2D/Library/metadata/da/daf8ab28ea6df4773bf38cb9e3e173e1
	Project Legacy 2D/Library/metadata/dc/dc7abfa0435174ded902b073322d67cc
	Project Legacy 2D/Library/metadata/df/df42ef794d3e0441783057cf822a525c
	Project Legacy 2D/Library/metadata/e0/e02bf8d8fe18948ea8ce546b6a32bee5
	Project Legacy 2D/Library/metadata/e5/e53c8c3dcc4ff59438bc9e86cb45c3f6
	Project Legacy 2D/Library/metadata/e8/e83c2f831bb0fd14b92751cdcbe823ec
	Project Legacy 2D/Library/metadata/e9/e9b2eead3d2f84ce19c1d65f1dbf66f9
	Project Legacy 2D/Library/metadata/f2/f2af333648c334319bd43c214449ab50
	Project Legacy 2D/Library/metadata/f3/f312cd3ac00139e4896140677aac0972
	Project Legacy 2D/Library/metadata/f6/f64b5ade8fc8ece419f55c5ad91569a8
	Project Legacy 2D/Library/metadata/f7/f781c091d1c8647c380d5230adfaee54
	Project Legacy 2D/Library/metadata/f8/f8216e89f470931439b9c0daa37ac507
	Project Legacy 2D/Library/metadata/ff/ff063c9db7e6e467d86d376ff5be5ca0
	Project Legacy 2D/Library/shadercompiler-1.log
	Project Legacy 2D/Project Legacy 2D-csharp.sln
	Project Legacy 2D/Project Legacy 2D.sln
	Project Legacy 2D/Project Legacy 2D.userprefs
Merge branch 'master' of https://github.com/Undiscovered-Game-Studios/Project-Legacy-2D

Conflicts:
	Project Legacy 2D/Assets/Tiled2Unity/Materials/pine.mat
	Project Legacy 2D/Assets/Tiled2Unity/Materials/pine.mat.meta
	Project Legacy 2D/Assets/Tiled2Unity/Textures/pine.png.meta
	Project Legacy 2D/Library/CurrentLayout.dwlt
	Project Legacy 2D/Library/assetDatabase3
	Project Legacy 2D/Library/expandedItems
	Project Legacy 2D/Library/guidmapper
	Project Legacy 2D/Project Legacy 2D-csharp.sln
	Project Legacy 2D/Project Legacy 2D.sln
Merge branch 'master' of https://github.com/Undiscovered-Game-Studios/Project-Legacy-2D