Fixes
Fixes
Avant pull
Merge branch 'master' of https://github.com/Kranchy/Looter
Merge branch 'Anim' of https://github.com/Kranchy/Looter

Conflicts:
	Project/Assets/Resources/Prefabs/Characters/Player.prefab
	Project/Assets/Scenes/MainScene.unity
	Project/Assets/Scripts/Humans/Player.cs
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/assetDatabase3
	Project/Library/metadata/9c/9c6ef08519ee72a49b8fbb3a7653f153
	Project/Library/metadata/a4/a4344c007367c0a49a131dfa631df4b2
	Project/Library/metadata/ea/ead9c23d12bb4de4ba9328d3c3320ecd
Fixes
Inventory
EFfd
Merge branch 'master' of https://github.com/Kranchy/Looter

Conflicts:
	Project/Assembly-CSharp-vs.csproj
	Project/Assembly-CSharp.csproj
	Project/Assets/Resources/Prefabs/Items/Bow.prefab
	Project/Assets/Scenes/MainScene.unity
	Project/Assets/Sounds/Effects/bruitarmureennemis.wav.meta
	Project/Assets/Sounds/Effects/bruitdepasdujoueur.wav.meta
	Project/Assets/Sprite/AnimationArc/AnimationArcdroite/Arc0.png.meta
	Project/Assets/Sprite/AnimationArc/AnimationArcdroite/Arc1.png.meta
	Project/Assets/Sprite/AnimationArc/AnimationArcdroite/Arc2.png.meta
	Project/Assets/Sprite/AnimationArc/AnimationArcdroite/Arc3.png.meta
	Project/Assets/Sprite/AnimationArc/AnimationArcdroite/Arc4.png.meta
	Project/Assets/Sprite/AnimationArc/AnimationArcgauche/Arc0.png.meta
	Project/Assets/Sprite/AnimationArc/AnimationArcgauche/Arc1.png.meta
	Project/Assets/Sprite/AnimationArc/AnimationArcgauche/Arc2.png.meta
	Project/Assets/Sprite/AnimationArc/AnimationArcgauche/Arc3.png.meta
	Project/Assets/Sprite/AnimationArc/AnimationArcgauche/Arc4.png.meta
	Project/Assets/Sprite/AnimationBombe/Bombe0.png.meta
	Project/Assets/Sprite/AnimationBombe/Bombe1.png.meta
	Project/Assets/Sprite/AnimationBombe/Bombe2.png.meta
	Project/Assets/Sprite/AnimationBombe/Bombe3.png.meta
	Project/Assets/Sprite/AnimationBombe/Bombe4.png.meta
	Project/Assets/Sprite/AnimationGarde/AnimationGardemarchedroite/Garde0.png.meta
	Project/Assets/Sprite/AnimationGarde/AnimationGardemarchedroite/Garde1.png.meta
	Project/Assets/Sprite/AnimationGarde/AnimationGardemarchedroite/Garde2.png.meta
	Project/Assets/Sprite/AnimationGarde/AnimationGardemarchedroite/Garde3.png.meta
	Project/Assets/Sprite/AnimationGarde/AnimationGardemarchedroite/Garde4.png.meta
	Project/Assets/Sprite/AnimationGarde/AnimationGardemarchegauche/Garde0.png.meta
	Project/Assets/Sprite/AnimationGarde/AnimationGardemarchegauche/Garde1.png.meta
	Project/Assets/Sprite/AnimationGarde/AnimationGardemarchegauche/Garde2.png.meta
	Project/Assets/Sprite/AnimationGarde/AnimationGardemarchegauche/Garde3.png.meta
	Project/Assets/Sprite/AnimationGarde/AnimationGardemarchegauche/Garde4.png.meta
	Project/Assets/Sprite/AnimationSautdroite/Saut0.png.meta
	Project/Assets/Sprite/AnimationSautdroite/Saut1.png.meta
	Project/Assets/Sprite/AnimationSautdroite/saut2.png.meta
	Project/Assets/Sprite/AnimationSautdroite/saut3.png.meta
	Project/Assets/Sprite/AnimationSautdroite/saut4.png.meta
	Project/Assets/Sprite/AnimationSautgauche/saut0.png.meta
	Project/Assets/Sprite/AnimationSautgauche/saut1.png.meta
	Project/Assets/Sprite/AnimationSautgauche/saut2.png.meta
	Project/Assets/Sprite/AnimationSautgauche/saut3.png.meta
	Project/Assets/Sprite/AnimationSautgauche/saut4.png.meta
	Project/Assets/Sprite/Animationbouclier/AnimationBoucliergauche/Bouclier0.png.meta
	Project/Assets/Sprite/Animationbouclier/AnimationBoucliergauche/Bouclier1.png.meta
	Project/Assets/Sprite/Animationbouclier/AnimationBoucliergauche/Bouclier2.png.meta
	Project/Assets/Sprite/Animationbouclier/AnimationbouclierDroite/Bouclier0.png.meta
	Project/Assets/Sprite/Animationbouclier/AnimationbouclierDroite/Bouclier1.png.meta
	Project/Assets/Sprite/Animationbouclier/AnimationbouclierDroite/Bouclier2.png.meta
	Project/Assets/Sprite/Animationcourse/Animationcoursedroite/course0.png.meta
	Project/Assets/Sprite/Animationcourse/Animationcoursedroite/course1.png.meta
	Project/Assets/Sprite/Animationcourse/Animationcoursedroite/course2.png.meta
	Project/Assets/Sprite/Animationcourse/Animationcoursedroite/course3.png.meta
	Project/Assets/Sprite/Animationcourse/Animationcoursedroite/course4.png.meta
	Project/Assets/Sprite/Animationcourse/Animationcoursedroite/course5.png.meta
	Project/Assets/Sprite/Animationcourse/Animationcoursegauche/course0.png.meta
	Project/Assets/Sprite/Animationcourse/Animationcoursegauche/course1.png.meta
	Project/Assets/Sprite/Animationcourse/Animationcoursegauche/course2.png.meta
	Project/Assets/Sprite/Animationcourse/Animationcoursegauche/course3.png.meta
	Project/Assets/Sprite/Animationcourse/Animationcoursegauche/course4.png.meta
	Project/Assets/Sprite/Animationcourse/Animationcoursegauche/course5.png.meta
	Project/Assets/Sprite/Animationcourse/Animationjambescoursedroite/course0.png.meta
	Project/Assets/Sprite/Animationcourse/Animationjambescoursedroite/course1.png.meta
	Project/Assets/Sprite/Animationcourse/Animationjambescoursedroite/course2.png.meta
	Project/Assets/Sprite/Animationcourse/Animationjambescoursedroite/course3.png.meta
	Project/Assets/Sprite/Animationcourse/Animationjambescoursedroite/course4.png.meta
	Project/Assets/Sprite/Animationcourse/Animationjambescoursedroite/course5.png.meta
	Project/Assets/Sprite/Animationcourse/Animationjambescoursegauche/course0.png.meta
	Project/Assets/Sprite/Animationcourse/Animationjambescoursegauche/course1.png.meta
	Project/Assets/Sprite/Animationcourse/Animationjambescoursegauche/course2.png.meta
	Project/Assets/Sprite/Animationcourse/Animationjambescoursegauche/course3.png.meta
	Project/Assets/Sprite/Animationcourse/Animationjambescoursegauche/course4.png.meta
	Project/Assets/Sprite/Animationcourse/Animationjambescoursegauche/course5.png.meta
	Project/Assets/Sprite/Animationcourse/Animationtorsecoursedroite/course0.png.meta
	Project/Assets/Sprite/Animationcourse/Animationtorsecoursedroite/course1.png.meta
	Project/Assets/Sprite/Animationcourse/Animationtorsecoursedroite/course2.png.meta
	Project/Assets/Sprite/Animationcourse/Animationtorsecoursedroite/course3.png.meta
	Project/Assets/Sprite/Animationcourse/Animationtorsecoursedroite/course4.png.meta
	Project/Assets/Sprite/Animationcourse/Animationtorsecoursedroite/course5.png.meta
	Project/Assets/Sprite/Animationcourse/Animationtorsecoursegauche/course0.png.meta
	Project/Assets/Sprite/Animationcourse/Animationtorsecoursegauche/course1.png.meta
	Project/Assets/Sprite/Animationcourse/Animationtorsecoursegauche/course2.png.meta
	Project/Assets/Sprite/Animationcourse/Animationtorsecoursegauche/course3.png.meta
	Project/Assets/Sprite/Animationcourse/Animationtorsecoursegauche/course4.png.meta
	Project/Assets/Sprite/Animationcourse/Animationtorsecoursegauche/course5.png.meta
	Project/Assets/Sprite/Animationcouteau/Aniationcouteaugauche/Couteau0.png.meta
	Project/Assets/Sprite/Animationcouteau/Aniationcouteaugauche/Couteau1.png.meta
	Project/Assets/Sprite/Animationcouteau/Aniationcouteaugauche/Couteau2.png.meta
	Project/Assets/Sprite/Animationcouteau/Aniationcouteaugauche/Couteau3.png.meta
	Project/Assets/Sprite/Animationcouteau/Animationcouteaudroite/Couteau0.png.meta
	Project/Assets/Sprite/Animationcouteau/Animationcouteaudroite/Couteau1.png.meta
	Project/Assets/Sprite/Animationcouteau/Animationcouteaudroite/Couteau2.png.meta
	Project/Assets/Sprite/Animationcouteau/Animationcouteaudroite/Couteau3.png.meta
	Project/Assets/Sprite/Animationepee/Animationepeedroite/epee0.png.meta
	Project/Assets/Sprite/Animationepee/Animationepeedroite/epee1.png.meta
	Project/Assets/Sprite/Animationepee/Animationepeedroite/epee2.png.meta
	Project/Assets/Sprite/Animationepee/Animationepeedroite/epee3.png.meta
	Project/Assets/Sprite/Animationepee/Animationepeedroite/epee4.png.meta
	Project/Assets/Sprite/Animationepee/Animationepeedroite/epee5.png.meta
	Project/Assets/Sprite/Animationepee/Animationepeegauche/epee0.png.meta
	Project/Assets/Sprite/Animationepee/Animationepeegauche/epee1.png.meta
	Project/Assets/Sprite/Animationepee/Animationepeegauche/epee2.png.meta
	Project/Assets/Sprite/Animationepee/Animationepeegauche/epee3.png.meta
	Project/Assets/Sprite/Animationepee/Animationepeegauche/epee4.png.meta
	Project/Assets/Sprite/Animationepee/Animationepeegauche/epee5.png.meta
	Project/Assets/Sprite/Animationtorsecoursedroite/course0.png.meta
	Project/Assets/Sprite/Animationtorsecoursedroite/course1.png.meta
	Project/Assets/Sprite/Animationtorsecoursedroite/course2.png.meta
	Project/Assets/Sprite/Animationtorsecoursedroite/course3.png.meta
	Project/Assets/Sprite/Animationtorsecoursedroite/course4.png.meta
	Project/Assets/Sprite/Animationtorsecoursedroite/course5.png.meta
	Project/Assets/Sprite/Animationtorsecoursegauche/course0.png.meta
	Project/Assets/Sprite/Animationtorsecoursegauche/course1.png.meta
	Project/Assets/Sprite/Animationtorsecoursegauche/course2.png.meta
	Project/Assets/Sprite/Animationtorsecoursegauche/course3.png.meta
	Project/Assets/Sprite/Animationtorsecoursegauche/course4.png.meta
	Project/Assets/Sprite/Animationtorsecoursegauche/course5.png.meta
	Project/Assets/Sprite/Arc.png.meta
	Project/Assets/Sprite/Arcversion2.png.meta
	Project/Assets/Sprite/Armure.png.meta
	Project/Assets/Sprite/Bombe.png.meta
	Project/Assets/Sprite/Bottes.png.meta
	Project/Assets/Sprite/Bouclier.png.meta
	Project/Assets/Sprite/Couteau.png.meta
	Project/Assets/Sprite/Epée.png.meta
	Project/Assets/Sprite/Garde.png.meta
	Project/Assets/Sprite/Grappin.png.meta
	Project/Assets/Sprite/Palmes.png.meta
	Project/Assets/Sprite/Pelle.png.meta
	Project/Assets/Sprite/PersonnageGauche.png.meta
	Project/Assets/Sprite/Personnagedroite.png.meta
	Project/Assets/Sprite/Rondselection/rondselectiongrand.png.meta
	Project/Assets/Sprite/Rondselection/rondselectiongrandfoncé.png.meta
	Project/Assets/Sprite/Rondselection/rondselectionmoyen.png.meta
	Project/Assets/Sprite/Rondselection/rondselectionmoyenfoncé.png.meta
	Project/Assets/Sprite/Rondselection/rondselectionpetit.png.meta
	Project/Assets/Sprite/Rondselection/rondselectionpetitfoncé.png.meta
	Project/Assets/Sprite/Taxe SAS.png.meta
	Project/Assets/Sprite/fleche.png.meta
	Project/Assets/mapTiled/map8.tmx.meta
	Project/Assets/mapTiled/tileSets/eau2.png.meta
	Project/Assets/mapTiled/tileSets/forest.psd.meta
	Project/Assets/mapTiled/tileSets/sol2.png.meta
	Project/Assets/mapTiled/tileSets/sol2.psd.meta
	Project/Library/CurrentLayout.dwlt
	Project/Library/InspectorExpandedItems.asset
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/assetDatabase3
	Project/Library/expandedItems
	Project/Library/guidmapper
	Project/Library/metadata/00/00000000000000004000000000000000
	Project/Library/metadata/00/0080152ef6e77c846a0c272da064d148
	Project/Library/metadata/00/00e8ad033462d454983afcda353e5d98
	Project/Library/metadata/01/010d6851072456b4a807c9fd123bf57b
	Project/Library/metadata/01/01a4fa96fe528f94aa737d8018c34a75
	Project/Library/metadata/05/057dce51de2108341869903427efec38
	Project/Library/metadata/07/07279aed6b6e3bf42bcbe37fa9f06769
	Project/Library/metadata/09/090729589e5ea8c4cbccb7e9109f8cb1
	Project/Library/metadata/09/09f2c7bf58dfafa49a96ee962516d2e7
	Project/Library/metadata/0a/0a3b69224f12d5a43ac7de7d62925ee0
	Project/Library/metadata/0e/0eca2e782d0ce264cab4f354d26b023a
	Project/Library/metadata/10/10561e4d1f6ed9f419ec5e7895556041
	Project/Library/metadata/11/11e991bedcf8540428a95c3dbb95f026
	Project/Library/metadata/12/12fa74d71c8438a46b79a6eae37b1640
	Project/Library/metadata/14/143ccc52d058ae146832b1f79b836507
	Project/Library/metadata/14/14f6a7ffa1ef35245ba0a94ebc416750
	Project/Library/metadata/16/163ddd78e9fa54d48b2e7bee33dddff3
	Project/Library/metadata/17/171e9c3e0e713d541bd0b4b633a68545
	Project/Library/metadata/17/1793cf97207a6ec4d8f78ca63780baec
	Project/Library/metadata/19/19e2c255cb9386a409af3547e5e6b82e
	Project/Library/metadata/1a/1aaafa4e4183e8e4fae6aa484b1ead9a
	Project/Library/metadata/1b/1b13e4631edf6394d84a331ea96ccf29
	Project/Library/metadata/1b/1bd0a2c836b77eb408a606c70e7feae2
	Project/Library/metadata/1d/1d4294fbb491f1f468b86b14df542768
	Project/Library/metadata/1d/1d5bd4e8fa6438d47b4e91d8cbb266a1
	Project/Library/metadata/1d/1d82748b116a14048b1b3c96c3305b23
	Project/Library/metadata/1d/1dab899625d510d4684d05868a3081d5
	Project/Library/metadata/1e/1e73f0d1606d2a643a6b09f046dfcea0
	Project/Library/metadata/20/20ee353aa6c557e4bbc01548b6c5453d
	Project/Library/metadata/21/211696f4bdb862f4caf9976e4834c5b0
	Project/Library/metadata/21/211bfccad8e126e42b1aae59a9c3c2e1
	Project/Library/metadata/24/24914c0a399f00f4c8343040b7937552
	Project/Library/metadata/26/26b3bd3a44010be44987df7f9585354a
	Project/Library/metadata/27/27bb80f4fc0f38040a282ebe9859f7db
	Project/Library/metadata/2a/2a002ba12c994024089de9402eb92717
	Project/Library/metadata/2a/2acd0ce3d962a7b4fab077c7b3098ebe
	Project/Library/metadata/2d/2d27defced045b3499a34c3e3913815b
	Project/Library/metadata/2e/2e113ffe716cf4048bfc0a9d46342af6
	Project/Library/metadata/2f/2fd51941c3ff3134f9571278a7e493ab
	Project/Library/metadata/30/30f6c79ee2ed43e4391bcf240ad99f33
	Project/Library/metadata/31/3127aee066f64d14fabeaae3c0d8cd26
	Project/Library/metadata/34/345caf2326348cd4b86a0cdb806b2a40
	Project/Library/metadata/37/37e01fccc5bd0c349ac2e17c3b822327
	Project/Library/metadata/3b/3b06debd1b75e19419feebe3737f0992
	Project/Library/metadata/3c/3c0ead820eaff474794ba9255509c084
	Project/Library/metadata/3c/3c96a781da0fe5b469c551e3e4e88280
	Project/Library/metadata/3d/3d91e6e9b2d186049a8f5364f8d7f0bf
	Project/Library/metadata/3e/3edd01eaedd773d4d99ed4cad2ed2181
	Project/Library/metadata/3e/3edf913e57d35d243834dc6fb607b417
	Project/Library/metadata/3f/3f764a7160968a341820ad2680155ec4
	Project/Library/metadata/40/40534873e36ef584397cd81463522693
	Project/Library/metadata/42/42e6741d98d5b6a48a990c38497519d7
	Project/Library/metadata/44/44dacdf9a887654448b7636e3f4115bd
	Project/Library/metadata/44/44fdbbe69d3b232459e3dab0d4529967
	Project/Library/metadata/45/451637654dc7339428ca5b13118f6172
	Project/Library/metadata/46/4600b78ac2866b24294392c41c57e330
	Project/Library/metadata/48/4835815df08361143ad17bd1f904eb3e
	Project/Library/metadata/48/48a2e35b19aa8e04b81771b08d23b833
	Project/Library/metadata/49/498ce7da9f57e0d49a0c96bca381a61b
	Project/Library/metadata/4a/4a47abfe3cce5be4ea41a151f5767c74
	Project/Library/metadata/4f/4f8f0006fe2d8f44392aa4a94141f697
	Project/Library/metadata/51/519b8af78b2750448baf49b306d59c6b
	Project/Library/metadata/51/51a2b8dd8f5afcd4e9a2271efceda5a0
	Project/Library/metadata/51/51f3d8e9a71f77d4c9f32f5189cd36f7
	Project/Library/metadata/54/5446fe23a6d43094a8c61b1392226087
	Project/Library/metadata/54/54c259f25f0452f41bd2a2a6f85b9275
	Project/Library/metadata/57/5715c8ef2b22e22409e0c017f9c0a595
	Project/Library/metadata/57/57c55d5e1d36d7747b2b6fd7fcce0551
	Project/Library/metadata/57/57f1e8d04771e264b832f94a14faa1b1
	Project/Library/metadata/59/591ca5a4806fc44428d5a5ea574f47ea
	Project/Library/metadata/59/5939dac048c512d4194adaed1fca7c9c
	Project/Library/metadata/59/59ecced494064e34fa4c4c67c3567d6c
	Project/Library/metadata/5a/5a9ad2a342e27484aa0c68fb30a6227d
	Project/Library/metadata/60/60805b0d0a7a14e4d8cb4318847c9ec3
	Project/Library/metadata/61/61ce43efc40617a4f9bfd159f6f979bd
	Project/Library/metadata/62/62ee20d884351ec4694678250830043b
	Project/Library/metadata/63/63072a59cabbe6a488884ab2c3a70741
	Project/Library/metadata/63/634f3f2bdac704b46b4c757fc0e0ae3f
	Project/Library/metadata/63/63979eb57bcf70b4289139aa45c59e7a
	Project/Library/metadata/65/65e591301c6922e4295cc4fb9906acbb
	Project/Library/metadata/66/663e89d736f801b409631d3b8556ded1
	Project/Library/metadata/68/6826b50b393c83446ae580b323732fd8
	Project/Library/metadata/69/69b6c7052c7b3bc428687952302883f7
	Project/Library/metadata/6e/6e175736112806445aa4f3c6841779bb
	Project/Library/metadata/6e/6e57ae420f062544492a0d3a42a603d8
	Project/Library/metadata/70/708db95d2e46b0a4aadf6960b857114f
	Project/Library/metadata/70/70d994a64e5154849a0a3e8fbcb77ccd
	Project/Library/metadata/76/76af26c29f916784d9d499e0f17af5fd
	Project/Library/metadata/79/7931bb73dcc6fc848b19e180c521491b
	Project/Library/metadata/7d/7df502fe600d1f94a964432703d4a31e
	Project/Library/metadata/7f/7fcd0cb4711145142bf827d81f785d15
	Project/Library/metadata/80/80312c28dd3053e49a6fadd6b967c04f
	Project/Library/metadata/81/81b648f4be510b64d888f20ea55116cf
	Project/Library/metadata/82/82d85bb6efff8fe4f8716bc83dc001b6
	Project/Library/metadata/84/842d50c690f19e349a5d77c0154d38d5
	Project/Library/metadata/85/85ab0fbe153d2fb4da4a470f3753ed96
	Project/Library/metadata/86/86a17b3e08fb14e48b4ff60b26abb287
	Project/Library/metadata/86/86cd46f0d6d43f549b62e7d1bd741ada
	Project/Library/metadata/89/898c64098ade6fa40ad3a67c43c1d5bd
	Project/Library/metadata/8a/8a004087ae9577d409209afd5052c78e
	Project/Library/metadata/8c/8c20f523a97d109448d671536cfecb05
	Project/Library/metadata/8c/8ca16018e60dfd147a1518f636679ad8
	Project/Library/metadata/8d/8db51d666843f434ba1fd5d4eace4d76
	Project/Library/metadata/8e/8eb2ed401f7977d4fba3c563266584b0
	Project/Library/metadata/90/90ec4629da6357b44980b9e138df7dfa
	Project/Library/metadata/91/9181dac82c64b0b459d57a3a378f4f83
	Project/Library/metadata/9c/9cb9a01259c7be042a6ee936e308cf42
	Project/Library/metadata/9e/9e4e333f6b422394fa6bf9a2943c1e1d
	Project/Library/metadata/9f/9f0ef499d6b84744581ba0d5e935f7ab
	Project/Library/metadata/9f/9fdb497fd89ebfc4bb2818b1ad2678c5
	Project/Library/metadata/a1/a10d98c52e36e1542a931e65673b3d4a
	Project/Library/metadata/a1/a119afab61123e541a24051c0dd5ee94
	Project/Library/metadata/a1/a15e4fabb5f649544a5bfe3a5054acd4
	Project/Library/metadata/a1/a1e5f2383874b4944b024cbe38932fa0
	Project/Library/metadata/a2/a21332d45991bf74e835a745e1c99a87
	Project/Library/metadata/a2/a29616df6a92c0a4388c302553ce2f48
	Project/Library/metadata/a3/a3009fe74780d1c4e81cadcccebcd1e1
	Project/Library/metadata/a4/a4bed424ca85efa4ba74787ed4cd2537
	Project/Library/metadata/a5/a5f228ce08d08884eabcf1da5c55c34d
	Project/Library/metadata/a6/a6494b47bce41a044bea0f29b99ab716
	Project/Library/metadata/a7/a770cda240850df4bb7ff5a151283e79
	Project/Library/metadata/a7/a7ac5aeeb6b9ea543981f43c7ff09554
	Project/Library/metadata/ab/ab636176a39e9a9459120e3596885133
	Project/Library/metadata/ac/ac3877779ef2a13478570673612c430a
	Project/Library/metadata/ae/ae2ad55f2c2675c4da464e48563d025b
	Project/Library/metadata/ae/aeba5c9c2a85f0e43a8c2476e780bd99
	Project/Library/metadata/b2/b2f0d3d62a1db9a4e8b2298e6f0301b5
	Project/Library/metadata/b3/b3cf091ade72773428f006b077231153
	Project/Library/metadata/b4/b42129e4b779eb14a96136c00db71abc
	Project/Library/metadata/b4/b45583f7f8a8c0740836be892a16af9c
	Project/Library/metadata/b4/b46dd7cd3d264694796f0f85fa21010c
	Project/Library/metadata/b5/b5203d92b1f27e74d82ff6aa6f865231
	Project/Library/metadata/b5/b5555d3566b4ee647bb4a29a09ed360c
	Project/Library/metadata/b6/b61ad4dc25c89014686e096bcba11d4e
	Project/Library/metadata/b6/b684eed25ad295a4aa47724f50672f46
	Project/Library/metadata/b7/b7094217ecd7c5440b2c41bf11ce4768
	Project/Library/metadata/b8/b8f8705141331fe45a8a05bf1008b2c7
	Project/Library/metadata/ba/bab729e5265b00c4a870de79b0ad652d
	Project/Library/metadata/ba/bafb9263adc9f5f46a9b5f8a07dd0116
	Project/Library/metadata/bb/bb07ec71e35844543848a70eafd2b476
	Project/Library/metadata/bc/bcac72f2b357d234bb84ab7269617f16
	Project/Library/metadata/bd/bda3f788b068d084fa8bedfdbde6899e
	Project/Library/metadata/be/befa2d7f8852b4446a13587b6436c1b6
	Project/Library/metadata/c1/c1678dac04210ee40a7a8b763c269747
	Project/Library/metadata/c1/c1cad1c6d07098c4eb81aa6e111bdfba
	Project/Library/metadata/c2/c2ca50d6297abea409076d93fe8b6500
	Project/Library/metadata/c3/c322ed683899b414bbd0a232142b83ca
	Project/Library/metadata/c3/c345136f53142ba4a999529501f8ecd5
	Project/Library/metadata/c4/c4e30c1aaf024f74ab91dd3da57b27ec
	Project/Library/metadata/c7/c748405982b6c3d40bbae29535a2dbc8
	Project/Library/metadata/c7/c7c83daf4f7a83844ac6aa1b1faba25b
	Project/Library/metadata/c9/c904e440b04d225489f1986c571cc0d9
	Project/Library/metadata/c9/c927ffb232e12b14dbc723ce3022cadd
	Project/Library/metadata/c9/c9e4bcb7f80618c48ba071dc71e1c9d3
	Project/Library/metadata/ca/cacbf5d91f5a7314a89677f3c0b3da9a
	Project/Library/metadata/ca/cad8a9170324aed4aa6fefe53dd7574a
	Project/Library/metadata/cb/cbe336ecbf9bd2e4fbde56205bbe4d5e
	Project/Library/metadata/cb/cbfee2530f9ac084f881e54b1910524b
	Project/Library/metadata/cc/cca9fc6ce04bba546b277cd2e89b70b1
	Project/Library/metadata/ce/cec64e4bfa319fd4887c1c812f87f47f
	Project/Library/metadata/d1/d15efeaa7a29659488f8e896731e563e
	Project/Library/metadata/d1/d1d200156e43c204ab49ef914c27241f
	Project/Library/metadata/d6/d6ef70d94d5742242a70d80bcb07feb4
	Project/Library/metadata/d9/d9c4500f13b5afc49aaf67f8253d350a
	Project/Library/metadata/d9/d9e80bcf3ae071f44a46f06aa1c3c1c4
	Project/Library/metadata/da/da20c776b65ad50498ae86303de7d5a9
	Project/Library/metadata/da/da277b5092eec5a4aa83527f9d5012e3
	Project/Library/metadata/da/dad5539436179f74bad5f087519560cf
	Project/Library/metadata/db/dbb77b928e72b0443a883e15d9b5aa31
	Project/Library/metadata/dc/dc2842ecaf6a92e458061e2005f06775
	Project/Library/metadata/dc/dc771af2936dbf546a3eb60eba7eb66e
	Project/Library/metadata/dd/dd724dd2f00af7f45ba847cb85920e7e
	Project/Library/metadata/de/de6dfa3542009024b83aac8b1a986c60
	Project/Library/metadata/df/dfa5fb5c7284caa40a20399340024fc6
	Project/Library/metadata/e0/e0716288e219177428c184c88e6c0e18
	Project/Library/metadata/e0/e0a52876af5dcce48a73c6496ef2cec1
	Project/Library/metadata/e1/e1d07c0c40317a24dad1c44434d04c89
	Project/Library/metadata/e2/e25553266f923a740a8310f3440a2dea
	Project/Library/metadata/e4/e453096cee47bdc45ae561df8a967cf5
	Project/Library/metadata/e5/e539aba2d44c99f499ddddffc739471c
	Project/Library/metadata/e5/e5821c6aad16d2344b407e7f7226e0f3
	Project/Library/metadata/e5/e58ebc91b04fba34bb055cbd456d8ced
	Project/Library/metadata/e5/e5f43de6c47376940b50f9bb3a5b2dc1
	Project/Library/metadata/e7/e76c5892f7a20b5499e9d1a64a2dbe19
	Project/Library/metadata/e9/e985555523d782f489263ba56107e48f
	Project/Library/metadata/e9/e9d61c6bfe08d854fb7d260be1dde075
	Project/Library/metadata/ea/ea0bc1fa63a918f4a9b52782a7f96bf0
	Project/Library/metadata/ea/ead9c23d12bb4de4ba9328d3c3320ecd
	Project/Library/metadata/eb/eb1db92086bbe984ca5686e4e5b2795e
	Project/Library/metadata/ed/ed8888dea8632d74487cbadee1645e12
	Project/Library/metadata/ee/ee856eeeee69d184cbd0b9d1d22beaae
	Project/Library/metadata/ef/ef44ea81375ae28449a878869089c193
	Project/Library/metadata/f0/f0ddd6df7c56ec74893d89ca39433510
	Project/Library/metadata/f4/f4aba033c70ae2c49b9f6ae1080e3d8e
	Project/Library/metadata/f5/f5910209d423aba44a5e693b94476a1d
	Project/Library/metadata/f9/f926472ecab1f694f95e4d53d3cda978
	Project/Library/metadata/f9/f97c11000185ffb45b9966641201da11
	Project/Library/metadata/fa/fa1daf9a34b2b3b4ab21852c7025bb43
	Project/Library/metadata/fb/fb6763da68340a847b8d3f5addf5bc41
	Project/Project-csharp.sln
	Project/Project.sln
	Project/Project.userprefs
Merge branch 'Anim' of https://github.com/Kranchy/Looter

Conflicts:
	Project/Assets/Scenes/MainScene.unity
	Project/Assets/Scripts/Humans/Player.cs
	Project/Assets/Scripts/Managers/InputManager.cs
	Project/Assets/Sounds.meta
	Project/Assets/Tiled2Unity.meta
	Project/Assets/Tiled2Unity/Imported.meta
	Project/Assets/Tiled2Unity/Materials.meta
	Project/Assets/Tiled2Unity/Meshes.meta
	Project/Assets/Tiled2Unity/Prefabs.meta
	Project/Assets/Tiled2Unity/Scripts.meta
	Project/Assets/Tiled2Unity/Scripts/Runtime.meta
	Project/Assets/Tiled2Unity/Shaders.meta
	Project/Assets/Tiled2Unity/Textures.meta
	Project/Assets/mapTiled/map1.tmx.meta
	Project/Assets/mapTiled/map2.tmx.meta
	Project/Assets/mapTiled/map3.tmx.meta
	Project/Assets/mapTiled/tileSets/Thumbs.db.meta
	Project/Assets/mapTiled/tileSets/eau2.png.meta
	Project/Assets/mapTiled/tileSets/forest.psd.meta
	Project/Assets/mapTiled/tileSets/sol2.png.meta
	Project/Assets/mapTiled/tileSets/sol2.psd.meta
	Project/Library/CurrentLayout.dwlt
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/assetDatabase3
	Project/Library/expandedItems
	Project/Library/guidmapper
	Project/Library/metadata/2f/2f99f3a6164d8c145abc4b715e1459c3
	Project/Library/metadata/64/64ddb0f8384b0ea45982aacfa74b943a
	Project/Library/metadata/9c/9c6ef08519ee72a49b8fbb3a7653f153
	Project/Library/metadata/a7/a771fdedbb9c2cf48b8f7701695d80c7
	Project/Library/metadata/b4/b451993c613535848aab451289c51334
	Project/Library/metadata/ea/ead9c23d12bb4de4ba9328d3c3320ecd
	Project/Library/metadata/f2/f27c056b1858e2844bbd10c76026552c
	Project/Library/metadata/fb/fb34392bdde58db49beca05a66738793