map collider
Merge branch 'master' of https://github.com/ChubbyLover/GamefulLiving

Conflicts:
	devbuild0.1/Assets/Resources/Prefabs/GUI/Alpha_Menu/GUI_Ingame/Healthbars/Healthbar.png.meta
	devbuild0.1/Assets/Resources/Prefabs/GUI/Alpha_Menu/GUI_Ingame/Healthbars/Healthbar_Bar_Outline.png.meta
	devbuild0.1/Assets/Resources/Prefabs/GUI/Alpha_Menu/GUI_Ingame/Healthbars/Healthbar_Darm.png.meta
	devbuild0.1/Assets/Resources/Prefabs/GUI/Alpha_Menu/GUI_Ingame/Healthbars/Healthbar_Heart.png.meta
	devbuild0.1/Assets/Resources/Prefabs/GUI/Alpha_Menu/GUI_Ingame/Healthbars/Healthbar_Heart_green.png.meta
	devbuild0.1/Assets/Resources/Prefabs/GUI/Alpha_Menu/GUI_Ingame/Healthbars/Healthbar_Lunge.png.meta
	devbuild0.1/Assets/Resources/Prefabs/GUI/Alpha_Menu/GUI_Ingame/Healthbars/Healthbar_bar.png.meta
	devbuild0.1/Assets/Scenes/Level_Alpha.unity
	devbuild0.1/Library/CurrentLayout.dwlt
	devbuild0.1/Library/CurrentMaximizeLayout.dwlt
	devbuild0.1/Library/ScriptAssemblies/Assembly-CSharp.dll
	devbuild0.1/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	devbuild0.1/Library/assetDatabase3
	devbuild0.1/Library/expandedItems
	devbuild0.1/Library/guidmapper
	devbuild0.1/Library/metadata/01/0137728f7feea0c4e825aa560c9b010e
	devbuild0.1/Library/metadata/05/05c8648d423c7534a800f25eb68d81d8
	devbuild0.1/Library/metadata/0a/0a33d5255d9a3fd439b2b0f099e9c9b7
	devbuild0.1/Library/metadata/0a/0a63f1aee4e13cd4c8addf0717038b33
	devbuild0.1/Library/metadata/0d/0de2fb3ac13a04142a398d7adc20791c
	devbuild0.1/Library/metadata/11/1108475361f107d4e904391473c3e94d
	devbuild0.1/Library/metadata/12/12427b34772016c488739b908fbcd753
	devbuild0.1/Library/metadata/12/12e0f208a6597c94c871deb64a43069a
	devbuild0.1/Library/metadata/13/13f67f156788e374f9f8c31f01618d9e
	devbuild0.1/Library/metadata/15/15e69ed83314dc84dba5d91804a8dc45
	devbuild0.1/Library/metadata/18/18f059e41860f324e809d43be3d6b3ea
	devbuild0.1/Library/metadata/1a/1aa6e6612801913408dfced3e8abd7f1
	devbuild0.1/Library/metadata/1b/1b726bf1526ac874089d270030322b40
	devbuild0.1/Library/metadata/1c/1c14725a8b92d9c46aa91839228f0b56
	devbuild0.1/Library/metadata/1c/1c4579469ed3d0b4ea7b8fa6b26b206f
	devbuild0.1/Library/metadata/1d/1d85320b69fcb6b439f3d4a53d15fa22
	devbuild0.1/Library/metadata/1d/1d9697a8c421da44196889062853729d
	devbuild0.1/Library/metadata/1e/1e90d4f80dd37c54eb4535945aab0cfd
	devbuild0.1/Library/metadata/23/23fd5649235297442ae126857fa5072a
	devbuild0.1/Library/metadata/25/25bcdc8465f8f064aaf83a14b797ae59
	devbuild0.1/Library/metadata/27/27f5aebf87fb9da4790f5f1eb4a43027
	devbuild0.1/Library/metadata/2b/2b2701746f85fbb478b83273b010e31d
	devbuild0.1/Library/metadata/2d/2d6202548115b264a9f2f69605e19600
	devbuild0.1/Library/metadata/2d/2dccd0cb6b0985949939b46a2162ce1d
	devbuild0.1/Library/metadata/2e/2edf785fbb4db164fb2f29774599a61e
	devbuild0.1/Library/metadata/32/3274c27f91257404b95cc0d5e73ec06f
	devbuild0.1/Library/metadata/32/32fc268389082f347adf982ebceb7659
	devbuild0.1/Library/metadata/34/343ec3fbd6c82984cbf5d7debe7d22a6
	devbuild0.1/Library/metadata/34/34f1cdbcf4d732c4da8b07d32741d6c5
	devbuild0.1/Library/metadata/39/3989704f730a7c149b4044c189949202
	devbuild0.1/Library/metadata/3a/3a9972cf81a2d824492fb29e2f80f384
	devbuild0.1/Library/metadata/3b/3b48c291c2e2b1c44974179367bfddd2
	devbuild0.1/Library/metadata/3f/3f88c6e283bca8d4c992dbb1776d854f
	devbuild0.1/Library/metadata/3f/3fb8ed635f8071b40bdfef8f1d605266
	devbuild0.1/Library/metadata/40/40aeab819448ee547870e5126be863dd
	devbuild0.1/Library/metadata/44/44ebc1f37991d3841baedba288c804b9
	devbuild0.1/Library/metadata/47/47c008be4441d34408b8a0e3cae2f5ca
	devbuild0.1/Library/metadata/48/485e0cea0d3ee924b92c659cb8035384
	devbuild0.1/Library/metadata/4e/4e61bdd239107044e814a3a8223ae002
	devbuild0.1/Library/metadata/4e/4e816c42fb827f74ebc98392471c39d0
	devbuild0.1/Library/metadata/52/527c78d5ad2dd634e8eb4b303a7c1d77
	devbuild0.1/Library/metadata/52/52913012447f8c24e95361ca4046894c
	devbuild0.1/Library/metadata/55/55eaa7e9e3fdca64c9485d6d2b073ac5
	devbuild0.1/Library/metadata/58/5853e47b3fd310d4485e98177543a5df
	devbuild0.1/Library/metadata/58/58f6008784be6314c8c20acac3f4dfcf
	devbuild0.1/Library/metadata/5b/5b27af3e49ce09e40901087e85371f28
	devbuild0.1/Library/metadata/64/6439a258f82d6b14e8250039da8931b6
	devbuild0.1/Library/metadata/64/64744aa8bad2a354689975dd6725eeca
	devbuild0.1/Library/metadata/67/67e14bf91e9221644a627bbec8e1cac3
	devbuild0.1/Library/metadata/69/699cd0e34ae7c4a4c93d04847bac217e
	devbuild0.1/Library/metadata/74/74c210e258fe5924a95521703d848477
	devbuild0.1/Library/metadata/75/7545912ea6b127e41a3730c262170f9e
	devbuild0.1/Library/metadata/7a/7a362ab32e931114fb24c5080ccf5f4c
	devbuild0.1/Library/metadata/7b/7b88ff98a9f3892499b7a2d5f6bbb79a
	devbuild0.1/Library/metadata/7c/7c03b0abb184e5143ad3b1fbae4ee952
	devbuild0.1/Library/metadata/7c/7c13c83eb6b13f240af7c1dfc49533f0
	devbuild0.1/Library/metadata/7e/7e140d870342bb24ba5bb5032d4afe13
	devbuild0.1/Library/metadata/81/81ffb1a7d937116479769a9f7f21167d
	devbuild0.1/Library/metadata/86/86b9c047cb91acd449e5ba21f3ba6e56
	devbuild0.1/Library/metadata/89/899e2a8b1257cff49bd29efd7f78d59d
	devbuild0.1/Library/metadata/8a/8aed90d8654f5434b8632d2fb6ffaf41
	devbuild0.1/Library/metadata/8e/8eb64d35c98bff741b8149a99b8e73b4
	devbuild0.1/Library/metadata/90/904c5b4557336db449f98da99da728c9
	devbuild0.1/Library/metadata/92/92654eb5338a6bd40a7fbfde0c116a00
	devbuild0.1/Library/metadata/95/95f91b2136310064fb7c45890e71d049
	devbuild0.1/Library/metadata/96/968e640a1d058614a8c92cea1b77e360
	devbuild0.1/Library/metadata/97/97a0a80531bf712459bbff2867b43adf
	devbuild0.1/Library/metadata/9a/9a53119e1d393a84c9ca3ae8efeb0287
	devbuild0.1/Library/metadata/9c/9c599a46716b1c64399a4da8594095e9
	devbuild0.1/Library/metadata/9c/9cd2c501a7592674a9ddd07f5a106f47
	devbuild0.1/Library/metadata/9d/9d96194d0387ed448b3b53e33f0dc4c0
	devbuild0.1/Library/metadata/9f/9f83ef9b8e6def248b4db6e0b4d80c49
	devbuild0.1/Library/metadata/9f/9fa62a58bf19ec24bb8a21c92bfafbf6
	devbuild0.1/Library/metadata/a0/a0bbe173f2cc5c244a6338da46ea1c9e
	devbuild0.1/Library/metadata/a7/a758ff55ae107a442a062ac29b745c80
	devbuild0.1/Library/metadata/a7/a79777278bfab5c4bbaad265a8e56d9e
	devbuild0.1/Library/metadata/a8/a82fba89553d9954fb54669c2f109258
	devbuild0.1/Library/metadata/a9/a9edd98196069984ab22d4cafc8f59bf
	devbuild0.1/Library/metadata/aa/aae8c30d2b94d1d4dae5e0649a855b46
	devbuild0.1/Library/metadata/ae/aed5e80c120abcb44afd26bf898e406f
	devbuild0.1/Library/metadata/b3/b3e3fb972f45c604695d64284135b3b3
	devbuild0.1/Library/metadata/b8/b8e91f9094145e84894b43f511fb3f1a
	devbuild0.1/Library/metadata/b9/b9eab25f61cb0224eabc8442907c19c9
	devbuild0.1/Library/metadata/b9/b9eefa21f99c3a54d9bcf1dbbf85f338
	devbuild0.1/Library/metadata/ba/bafa65d3b84d0b246b416d9f52d35728
	devbuild0.1/Library/metadata/bc/bcb597095eeabee49a6ceb643fc98a9b
	devbuild0.1/Library/metadata/bd/bd7f5c30d57a9a040a8f4162af1a99df
	devbuild0.1/Library/metadata/bf/bf5c66d6943170344a5b3081a9bab01b
	devbuild0.1/Library/metadata/bf/bfc0fe7700502824fb1f5b87303a01e4
	devbuild0.1/Library/metadata/c2/c2988a75bff30a64cac0db74c302e341
	devbuild0.1/Library/metadata/c3/c376e2d5baee52e44bf6e165afc061a1
	devbuild0.1/Library/metadata/c5/c51546afae440c049a4610193940853c
	devbuild0.1/Library/metadata/c6/c6594821211c82d4385f601262f7ca21
	devbuild0.1/Library/metadata/c7/c78098edbe0a40e4cac9083dc4f36844
	devbuild0.1/Library/metadata/c8/c8d83380437849c409bd01575a082977
	devbuild0.1/Library/metadata/c9/c9064ed8de941a54b9d10be74e2bd00d
	devbuild0.1/Library/metadata/c9/c921aa879379dd54b96ec766ea1f784c
	devbuild0.1/Library/metadata/ce/cebfde20895fbc448a0f9cb9fe68da93
	devbuild0.1/Library/metadata/d0/d0645d3132f6422438b0df832ece3636
	devbuild0.1/Library/metadata/d0/d0b0846ddc3af67458a9f4df2e0f04d6
	devbuild0.1/Library/metadata/d1/d1bcc418884e2f941879f426dd858b8f
	devbuild0.1/Library/metadata/d5/d50bd348c56b9f440b5a2e58e2c6de07
	devbuild0.1/Library/metadata/d5/d5de77ef9014fde4d8ff86cc3b98b1b8
	devbuild0.1/Library/metadata/d6/d6426daa37967564da70edaeacc2e5ef
	devbuild0.1/Library/metadata/d9/d98bc01ae9ae55f43926e91f9a2bcd4f
	devbuild0.1/Library/metadata/db/db61ab1f29d394845acc0e9f49d20b3c
	devbuild0.1/Library/metadata/dc/dce728e3bf29583488aed902405aab4c
	devbuild0.1/Library/metadata/df/df6678fe418192244938b86be9421c41
	devbuild0.1/Library/metadata/df/dfd0f5dae127de84589cfb9e7ddfd0cb
	devbuild0.1/Library/metadata/e3/e350c35961fcea84693b828025e34522
	devbuild0.1/Library/metadata/e4/e48f72dd3d78b6a469b67ee89e2dd17f
	devbuild0.1/Library/metadata/e4/e4edfcbf84d1585488923729b5a191dd
	devbuild0.1/Library/metadata/e9/e94c6dbe90233fc469eb332c52e0e58e
	devbuild0.1/Library/metadata/e9/e9fecd6859d533f479201ae45f4c3165
	devbuild0.1/Library/metadata/ea/ea75e394d46ba2f4d863f5d49b3ffcd3
	devbuild0.1/Library/metadata/ec/ec9e50bf8164b334899151701c9c9df0
	devbuild0.1/Library/metadata/ed/ed179fc0bb812ad4caf0b1285ec3bcfd
	devbuild0.1/Library/metadata/ed/ed6ef04fc92b5c14fbbbb6fd75839961
	devbuild0.1/Library/metadata/f1/f108dcf0ada101a44ace92012ac349fb
	devbuild0.1/Library/metadata/f4/f43f1d5f494b8584380608d5f1890b15
	devbuild0.1/Library/metadata/fb/fbe0ab8baf676274d8bb8e86d5f57810
	devbuild0.1/Library/metadata/fc/fc1d45257deec2d4693c6845454bc25d
	devbuild0.1/devbuild0.1.userprefs