diff --git a/Assets/Animations/CharacterShoot.anim b/Assets/Animations/CharacterShoot.anim
index e441d83..aba9329 100644
--- a/Assets/Animations/CharacterShoot.anim
+++ b/Assets/Animations/CharacterShoot.anim
@@ -19,6 +19,10 @@ AnimationClip:
   - curve:
     - time: 0
       value: {fileID: 21300024, guid: affde2e1a66595c46989d8f63273bb41, type: 3}
+    - time: .0833333358
+      value: {fileID: 21300024, guid: affde2e1a66595c46989d8f63273bb41, type: 3}
+    - time: .166666672
+      value: {fileID: 21300024, guid: affde2e1a66595c46989d8f63273bb41, type: 3}
     attribute: m_Sprite
     path: 
     classID: 212
@@ -38,10 +42,12 @@ AnimationClip:
       isPPtrCurve: 1
     pptrCurveMapping:
     - {fileID: 21300024, guid: affde2e1a66595c46989d8f63273bb41, type: 3}
+    - {fileID: 21300024, guid: affde2e1a66595c46989d8f63273bb41, type: 3}
+    - {fileID: 21300024, guid: affde2e1a66595c46989d8f63273bb41, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_StartTime: 0
-    m_StopTime: .0833333358
+    m_StopTime: .25
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
diff --git a/Assets/Animations/JumpShoot.anim b/Assets/Animations/JumpShoot.anim
index 59a0b32..3b5b21c 100644
--- a/Assets/Animations/JumpShoot.anim
+++ b/Assets/Animations/JumpShoot.anim
@@ -18,7 +18,11 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: 0}
+      value: {fileID: 21300032, guid: affde2e1a66595c46989d8f63273bb41, type: 3}
+    - time: .0833333358
+      value: {fileID: 21300032, guid: affde2e1a66595c46989d8f63273bb41, type: 3}
+    - time: .166666672
+      value: {fileID: 21300032, guid: affde2e1a66595c46989d8f63273bb41, type: 3}
     attribute: m_Sprite
     path: 
     classID: 212
@@ -37,11 +41,13 @@ AnimationClip:
       customType: 23
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: 0}
+    - {fileID: 21300032, guid: affde2e1a66595c46989d8f63273bb41, type: 3}
+    - {fileID: 21300032, guid: affde2e1a66595c46989d8f63273bb41, type: 3}
+    - {fileID: 21300032, guid: affde2e1a66595c46989d8f63273bb41, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_StartTime: 0
-    m_StopTime: .0833333358
+    m_StopTime: .25
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
diff --git a/Assets/Animations/RunShoot.anim b/Assets/Animations/RunShoot.anim
index 0ccac23..847eacd 100644
--- a/Assets/Animations/RunShoot.anim
+++ b/Assets/Animations/RunShoot.anim
@@ -18,12 +18,18 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: 0}
+      value: {fileID: 21300028, guid: affde2e1a66595c46989d8f63273bb41, type: 3}
+    - time: .166666672
+      value: {fileID: 21300026, guid: affde2e1a66595c46989d8f63273bb41, type: 3}
+    - time: .333333343
+      value: {fileID: 21300028, guid: affde2e1a66595c46989d8f63273bb41, type: 3}
+    - time: .5
+      value: {fileID: 21300030, guid: affde2e1a66595c46989d8f63273bb41, type: 3}
     attribute: m_Sprite
     path: 
     classID: 212
     script: {fileID: 0}
-  m_SampleRate: 12
+  m_SampleRate: 60
   m_WrapMode: 0
   m_Bounds:
     m_Center: {x: 0, y: 0, z: 0}
@@ -37,11 +43,14 @@ AnimationClip:
       customType: 23
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: 0}
+    - {fileID: 21300028, guid: affde2e1a66595c46989d8f63273bb41, type: 3}
+    - {fileID: 21300026, guid: affde2e1a66595c46989d8f63273bb41, type: 3}
+    - {fileID: 21300028, guid: affde2e1a66595c46989d8f63273bb41, type: 3}
+    - {fileID: 21300030, guid: affde2e1a66595c46989d8f63273bb41, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_StartTime: 0
-    m_StopTime: .0833333358
+    m_StopTime: .516666651
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
diff --git a/Assets/Animations/character_0.controller b/Assets/Animations/character_0.controller
index 012023c..c51a6bc 100644
--- a/Assets/Animations/character_0.controller
+++ b/Assets/Animations/character_0.controller
@@ -13,25 +13,25 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Ground
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 1
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: vSpeed
     m_Type: 1
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Shooting
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -45,6 +45,30 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
+--- !u!1101 &110110072
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 2
+    m_ConditionEvent: Shooting
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 110253326}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0
+  m_HasExitTime: 1
+  m_HasFixedDuration: 0
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &110152892
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -61,11 +85,11 @@ AnimatorStateTransition:
   m_Mute: 0
   m_IsExit: 0
   serializedVersion: 3
-  m_TransitionDuration: .25
+  m_TransitionDuration: 0
   m_TransitionOffset: 0
   m_ExitTime: 0
   m_HasExitTime: 1
-  m_HasFixedDuration: 1
+  m_HasFixedDuration: 0
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
@@ -96,6 +120,30 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1101 &110164442
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: Shooting
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 110298352}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &110170126
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -112,10 +160,10 @@ AnimatorStateTransition:
   m_Mute: 0
   m_IsExit: 0
   serializedVersion: 3
-  m_TransitionDuration: .25
+  m_TransitionDuration: 0
   m_TransitionOffset: 0
-  m_ExitTime: .825174809
-  m_HasExitTime: 1
+  m_ExitTime: 0
+  m_HasExitTime: 0
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
@@ -171,6 +219,30 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1101 &110186172
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 2
+    m_ConditionEvent: Shooting
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 110287914}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0
+  m_HasExitTime: 1
+  m_HasFixedDuration: 0
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &110194588
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -195,6 +267,54 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1101 &110198284
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: Shooting
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 110201332}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1102 &110201332
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: RunAndShoot
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 110110072}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 6f638740b2ffdeb45af40d99ed9b2566, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
 --- !u!1102 &110232456
 AnimatorState:
   serializedVersion: 5
@@ -232,6 +352,7 @@ AnimatorState:
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: 110183808}
+  - {fileID: 110198284}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -280,6 +401,7 @@ AnimatorState:
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: 110185632}
+  - {fileID: 110164442}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -293,6 +415,30 @@ AnimatorState:
   m_SpeedParameter: 
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
+--- !u!1102 &110298352
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: JumpShoot
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 110186172}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: e793796701ba6c941a5d7263eaf965a6, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
 --- !u!1107 &110795432
 AnimatorStateMachine:
   serializedVersion: 5
@@ -313,6 +459,12 @@ AnimatorStateMachine:
   - serializedVersion: 1
     m_State: {fileID: 110265402}
     m_Position: {x: 372, y: -60, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 110201332}
+    m_Position: {x: 780, y: 36, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 110298352}
+    m_Position: {x: 780, y: 168, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
diff --git a/Assets/Animations/enemy.controller b/Assets/Animations/enemy.controller
new file mode 100644
index 0000000..c5410e9
--- /dev/null
+++ b/Assets/Animations/enemy.controller
@@ -0,0 +1,67 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: enemy
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 110712868}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1102 &110250318
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: walking
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 8f3bfc75b0d904a4a939ad91f9e6fb96, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+--- !u!1107 &110712868
+AnimatorStateMachine:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 110250318}
+    m_Position: {x: 300, y: 108, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 48, y: 204, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 110250318}
diff --git a/Assets/Animations/enemy.controller.meta b/Assets/Animations/enemy.controller.meta
new file mode 100644
index 0000000..e0c5434
--- /dev/null
+++ b/Assets/Animations/enemy.controller.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 532dc94ed04ade946a636626daddb305
+timeCreated: 1447206660
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Animations/enemyWalk.anim b/Assets/Animations/enemyWalk.anim
new file mode 100644
index 0000000..2dc9f63
--- /dev/null
+++ b/Assets/Animations/enemyWalk.anim
@@ -0,0 +1,90 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: enemyWalk
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: 21300000, guid: d01a377b61762054b8f1c0e7fe5f88fd, type: 3}
+    - time: .0833333358
+      value: {fileID: 21300002, guid: d01a377b61762054b8f1c0e7fe5f88fd, type: 3}
+    - time: .166666672
+      value: {fileID: 21300004, guid: d01a377b61762054b8f1c0e7fe5f88fd, type: 3}
+    - time: .25
+      value: {fileID: 21300006, guid: d01a377b61762054b8f1c0e7fe5f88fd, type: 3}
+    - time: .333333343
+      value: {fileID: 21300008, guid: d01a377b61762054b8f1c0e7fe5f88fd, type: 3}
+    - time: .416666687
+      value: {fileID: 21300010, guid: d01a377b61762054b8f1c0e7fe5f88fd, type: 3}
+    - time: .5
+      value: {fileID: 21300012, guid: d01a377b61762054b8f1c0e7fe5f88fd, type: 3}
+    - time: .583333313
+      value: {fileID: 21300014, guid: d01a377b61762054b8f1c0e7fe5f88fd, type: 3}
+    - time: .666666627
+      value: {fileID: 21300016, guid: d01a377b61762054b8f1c0e7fe5f88fd, type: 3}
+    - time: .74999994
+      value: {fileID: 21300018, guid: d01a377b61762054b8f1c0e7fe5f88fd, type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 12
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - path: 0
+      attribute: 0
+      script: {fileID: 0}
+      classID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: 21300000, guid: d01a377b61762054b8f1c0e7fe5f88fd, type: 3}
+    - {fileID: 21300002, guid: d01a377b61762054b8f1c0e7fe5f88fd, type: 3}
+    - {fileID: 21300004, guid: d01a377b61762054b8f1c0e7fe5f88fd, type: 3}
+    - {fileID: 21300006, guid: d01a377b61762054b8f1c0e7fe5f88fd, type: 3}
+    - {fileID: 21300008, guid: d01a377b61762054b8f1c0e7fe5f88fd, type: 3}
+    - {fileID: 21300010, guid: d01a377b61762054b8f1c0e7fe5f88fd, type: 3}
+    - {fileID: 21300012, guid: d01a377b61762054b8f1c0e7fe5f88fd, type: 3}
+    - {fileID: 21300014, guid: d01a377b61762054b8f1c0e7fe5f88fd, type: 3}
+    - {fileID: 21300016, guid: d01a377b61762054b8f1c0e7fe5f88fd, type: 3}
+    - {fileID: 21300018, guid: d01a377b61762054b8f1c0e7fe5f88fd, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_StartTime: 0
+    m_StopTime: .833333254
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_LoopTime: 1
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_GenerateMotionCurves: 0
+  m_Events: []
diff --git a/Assets/Animations/enemyWalk.anim.meta b/Assets/Animations/enemyWalk.anim.meta
new file mode 100644
index 0000000..208fbe1
--- /dev/null
+++ b/Assets/Animations/enemyWalk.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8f3bfc75b0d904a4a939ad91f9e6fb96
+timeCreated: 1447206638
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Prefabs/Enemy.prefab b/Assets/Prefabs/Enemy.prefab
index c841f34..769ad76 100644
--- a/Assets/Prefabs/Enemy.prefab
+++ b/Assets/Prefabs/Enemy.prefab
@@ -12,6 +12,7 @@ GameObject:
   - 50: {fileID: 5020362}
   - 61: {fileID: 6163544}
   - 114: {fileID: 11431192}
+  - 95: {fileID: 9512508}
   m_Layer: 0
   m_Name: Enemy
   m_TagString: Untagged
@@ -60,6 +61,23 @@ BoxCollider2D:
   m_Offset: {x: 0, y: 0}
   serializedVersion: 2
   m_Size: {x: .330000013, y: .720000029}
+--- !u!95 &9512508
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 183722}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 532dc94ed04ade946a636626daddb305, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
 --- !u!114 &11431192
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -71,6 +89,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2995a96f18c88c3499b43774e78a5e9b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  ground: {fileID: 0}
 --- !u!212 &21249000
 SpriteRenderer:
   m_ObjectHideFlags: 1
@@ -103,7 +122,11 @@ Prefab:
   serializedVersion: 2
   m_Modification:
     m_TransformParent: {fileID: 0}
-    m_Modifications: []
+    m_Modifications:
+    - target: {fileID: 0}
+      propertyPath: m_Controller
+      value: 
+      objectReference: {fileID: 9100000, guid: 532dc94ed04ade946a636626daddb305, type: 2}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 0}
   m_RootGameObject: {fileID: 183722}
diff --git a/Assets/Scenes/JoelScene.unity b/Assets/Scenes/JoelScene.unity
index fb41d6d..fbf8c96 100644
--- a/Assets/Scenes/JoelScene.unity
+++ b/Assets/Scenes/JoelScene.unity
@@ -113,7 +113,7 @@ Transform:
   - {fileID: 1903720196}
   - {fileID: 1747148540}
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 4
 --- !u!1 &328141749
 GameObject:
   m_ObjectHideFlags: 0
@@ -168,6 +168,10 @@ Transform:
   m_Children: []
   m_Father: {fileID: 645992365}
   m_RootOrder: 0
+--- !u!4 &458710668 stripped
+Transform:
+  m_PrefabParentObject: {fileID: 476260, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+  m_PrefabInternal: {fileID: 1334973125}
 --- !u!1 &645992364
 GameObject:
   m_ObjectHideFlags: 0
@@ -195,6 +199,47 @@ Transform:
   m_Children:
   - {fileID: 328141751}
   m_Father: {fileID: 0}
+  m_RootOrder: 1
+--- !u!1 &792903395
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 792903397}
+  - 114: {fileID: 792903396}
+  m_Layer: 0
+  m_Name: FallCheck
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &792903396
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 792903395}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c1e6722564abf8f4a9aacf7b96cedb6f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  player: {fileID: 1189818989}
+  cam: {fileID: 1449410197}
+--- !u!4 &792903397
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 792903395}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
   m_RootOrder: 0
 --- !u!1001 &849444827
 Prefab:
@@ -284,6 +329,96 @@ Prefab:
 GameObject:
   m_PrefabParentObject: {fileID: 101678, guid: b7819e17682d74b45a71d6831a413e0b, type: 2}
   m_PrefabInternal: {fileID: 1024525637}
+--- !u!1001 &1334973125
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1397651834}
+    m_Modifications:
+    - target: {fileID: 476260, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 1.70217991
+      objectReference: {fileID: 0}
+    - target: {fileID: 476260, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: -.180000007
+      objectReference: {fileID: 0}
+    - target: {fileID: 476260, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 476260, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 476260, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 476260, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 476260, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 476260, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 476260, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+      propertyPath: m_LocalScale.x
+      value: .390161991
+      objectReference: {fileID: 0}
+    - target: {fileID: 476260, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+      propertyPath: m_LocalScale.y
+      value: .390161991
+      objectReference: {fileID: 0}
+    - target: {fileID: 476260, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+      propertyPath: m_LocalScale.z
+      value: .390161991
+      objectReference: {fileID: 0}
+    - target: {fileID: 11431192, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+      propertyPath: ground
+      value: 
+      objectReference: {fileID: 1803458949}
+    - target: {fileID: 5020362, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+      propertyPath: m_Constraints
+      value: 4
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+  m_IsPrefabParent: 0
+--- !u!1 &1397651833
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 1397651834}
+  m_Layer: 0
+  m_Name: enemies
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1397651834
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1397651833}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: .229820073, y: .551818013, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 458710668}
+  m_Father: {fileID: 0}
+  m_RootOrder: 5
 --- !u!1 &1449410197
 GameObject:
   m_ObjectHideFlags: 0
@@ -370,7 +505,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 1
+  m_RootOrder: 2
 --- !u!114 &1449410203
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -387,6 +522,10 @@ MonoBehaviour:
 Transform:
   m_PrefabParentObject: {fileID: 417046, guid: 6a21797441b99c942915e70c461edf77, type: 2}
   m_PrefabInternal: {fileID: 2106831666}
+--- !u!1 &1803458949 stripped
+GameObject:
+  m_PrefabParentObject: {fileID: 167312, guid: 6a21797441b99c942915e70c461edf77, type: 2}
+  m_PrefabInternal: {fileID: 849444827}
 --- !u!4 &1903720196 stripped
 Transform:
   m_PrefabParentObject: {fileID: 417046, guid: 6a21797441b99c942915e70c461edf77, type: 2}
diff --git a/Assets/Scenes/MasterScene.unity b/Assets/Scenes/MasterScene.unity
index fb41d6d..ea7612e 100644
--- a/Assets/Scenes/MasterScene.unity
+++ b/Assets/Scenes/MasterScene.unity
@@ -113,7 +113,7 @@ Transform:
   - {fileID: 1903720196}
   - {fileID: 1747148540}
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 5
 --- !u!1 &328141749
 GameObject:
   m_ObjectHideFlags: 0
@@ -195,7 +195,7 @@ Transform:
   m_Children:
   - {fileID: 328141751}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
+  m_RootOrder: 4
 --- !u!1001 &849444827
 Prefab:
   m_ObjectHideFlags: 0
@@ -238,6 +238,72 @@ Prefab:
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 6a21797441b99c942915e70c461edf77, type: 2}
   m_IsPrefabParent: 0
+--- !u!1001 &928564096
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1331320071}
+    m_Modifications:
+    - target: {fileID: 476260, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 1.70217991
+      objectReference: {fileID: 0}
+    - target: {fileID: 476260, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: -.180000007
+      objectReference: {fileID: 0}
+    - target: {fileID: 476260, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 476260, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 476260, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 476260, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 476260, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 476260, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 476260, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+      propertyPath: m_LocalScale.x
+      value: .390161991
+      objectReference: {fileID: 0}
+    - target: {fileID: 476260, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+      propertyPath: m_LocalScale.y
+      value: .390161991
+      objectReference: {fileID: 0}
+    - target: {fileID: 476260, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+      propertyPath: m_LocalScale.z
+      value: .390161991
+      objectReference: {fileID: 0}
+    - target: {fileID: 11431192, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+      propertyPath: ground
+      value: 
+      objectReference: {fileID: 1488389727}
+    - target: {fileID: 5020362, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+      propertyPath: m_Constraints
+      value: 4
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+  m_IsPrefabParent: 0
+--- !u!4 &928564097 stripped
+Transform:
+  m_PrefabParentObject: {fileID: 476260, guid: 65c71f57a846ec04db773e9c26c6e2e9, type: 2}
+  m_PrefabInternal: {fileID: 928564096}
 --- !u!1001 &1024525637
 Prefab:
   m_ObjectHideFlags: 0
@@ -284,6 +350,75 @@ Prefab:
 GameObject:
   m_PrefabParentObject: {fileID: 101678, guid: b7819e17682d74b45a71d6831a413e0b, type: 2}
   m_PrefabInternal: {fileID: 1024525637}
+--- !u!1 &1235119630
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 1235119632}
+  - 114: {fileID: 1235119631}
+  m_Layer: 0
+  m_Name: FallCheck
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1235119631
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1235119630}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c1e6722564abf8f4a9aacf7b96cedb6f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  player: {fileID: 1189818989}
+  cam: {fileID: 1449410197}
+--- !u!4 &1235119632
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1235119630}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+--- !u!1 &1331320070
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 1331320071}
+  m_Layer: 0
+  m_Name: enemies
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1331320071
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1331320070}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: .229820073, y: .551818013, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 928564097}
+  m_Father: {fileID: 0}
+  m_RootOrder: 1
 --- !u!1 &1449410197
 GameObject:
   m_ObjectHideFlags: 0
@@ -370,7 +505,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 1
+  m_RootOrder: 3
 --- !u!114 &1449410203
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -383,6 +518,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   player: {fileID: 1189818989}
+--- !u!1 &1488389727 stripped
+GameObject:
+  m_PrefabParentObject: {fileID: 167312, guid: 6a21797441b99c942915e70c461edf77, type: 2}
+  m_PrefabInternal: {fileID: 849444827}
 --- !u!4 &1747148540 stripped
 Transform:
   m_PrefabParentObject: {fileID: 417046, guid: 6a21797441b99c942915e70c461edf77, type: 2}
diff --git a/Assets/Scripts/EnemyBehavior.cs b/Assets/Scripts/EnemyBehavior.cs
index 5a8b28c..686489c 100644
--- a/Assets/Scripts/EnemyBehavior.cs
+++ b/Assets/Scripts/EnemyBehavior.cs
@@ -5,6 +5,8 @@ public class EnemyBehavior : MonoBehaviour {
 
     private float direction = 1.0f;
     private Rigidbody2D rb;
+	private bool facingRight = true;
+
 
     // Ground
     public GameObject ground;
@@ -24,5 +26,17 @@ public class EnemyBehavior : MonoBehaviour {
             direction *= -1.0f;
 
         rb.velocity = Vector2.right * direction;
+
+		if ((direction < 0 && facingRight) || (direction > 0 && !facingRight))
+			flip();
+		
+	}
+	
+	private void flip()
+	{
+		facingRight = !facingRight;
+		Vector3 scale = transform.localScale;
+		scale.x *= -1;
+		transform.localScale = scale;
 	}
 }
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index f3abab5..24b2ed9 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -8,6 +8,7 @@ PlayerSettings:
   defaultScreenOrientation: 4
   targetDevice: 2
   targetResolution: 0
+  useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: DefaultCompany
   productName: Laboratoire_2_Equipe_2
@@ -28,6 +29,7 @@ PlayerSettings:
   androidShowActivityIndicatorOnLoading: -1
   iosAppInBackgroundBehavior: 0
   displayResolutionDialog: 1
+  iosAllowHTTPDownload: 1
   allowedAutorotateToPortrait: 1
   allowedAutorotateToPortraitUpsideDown: 1
   allowedAutorotateToLandscapeRight: 1
@@ -135,6 +137,15 @@ PlayerSettings:
   iOSLaunchScreenFillPct: 100
   iOSLaunchScreenSize: 100
   iOSLaunchScreenCustomXibPath: 
+  iOSLaunchScreeniPadType: 0
+  iOSLaunchScreeniPadImage: {fileID: 0}
+  iOSLaunchScreeniPadBackgroundColor:
+    serializedVersion: 2
+    rgba: 0
+  iOSLaunchScreeniPadFillPct: 100
+  iOSLaunchScreeniPadSize: 100
+  iOSLaunchScreeniPadCustomXibPath: 
+  iOSDeviceRequirements: []
   AndroidTargetDevice: 0
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
@@ -224,6 +235,8 @@ PlayerSettings:
   ps4SdkOverride: 
   ps4BGMPath: 
   ps4ShareFilePath: 
+  ps4ShareOverlayImagePath: 
+  ps4PrivacyGuardImagePath: 
   ps4NPtitleDatPath: 
   ps4RemotePlayKeyAssignment: -1
   ps4RemotePlayKeyMappingDir: 
@@ -245,6 +258,7 @@ PlayerSettings:
   ps4attribMoveSupport: 0
   ps4attrib3DSupport: 0
   ps4attribShareSupport: 0
+  ps4IncludedModules: []
   monoEnv: 
   psp2Splashimage: {fileID: 0}
   psp2NPTrophyPackPath: