level4

Assets/Sprites/Animations/player.controller.meta

 fileFormatVersion: 2
-guid: a16566a6ce6ba9a44876de4d28e11422
+guid: 8231a5c0f9e799746aeacb3329b93e90
 timeCreated: 1512582417
 licenseType: Free
 NativeFormatImporter:

Assets/Sprites/Animations/shadow-boy-game-character-sprite-sheet-sidescroller-limbo-stickman-game-asset-flying-flappy-animation-gui-mobile-games-gameart-game-art-590.gif.meta

 fileFormatVersion: 2
-guid: 1c2f3df13d9276d48bde164b00bd9c60
+guid: 73253ffc7981b53479551cf2c27a90c4
 timeCreated: 1513047512
 licenseType: Free
 TextureImporter:

colourful-love.userprefs

 <Properties StartupItem="Assembly-CSharp.csproj">
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" PreferredExecutionTarget="Unity.Instance.Unity Editor" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="Assets\Scripts\BackgroundChanger.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Assets\Scripts\SceneLoader.cs">
     <Files>
-<<<<<<< HEAD
-      <File FileName="Assets\Scripts\PlayerController.cs" Line="1" Column="1" />
-      <File FileName="Assets\Scripts\PhysicObject.cs" Line="1" Column="1" />
-      <File FileName="Assets\Scripts\SceneLoader.cs" Line="1" Column="1" />
-      <File FileName="Assets\Scripts\BackgroundChanger.cs" Line="75" Column="1" />
+      <File FileName="Assets\Scripts\PlayerController.cs" Line="32" Column="14" />
       <File FileName="Assets\Scripts\CameraController.cs" Line="1" Column="1" />
-=======
-      <File FileName="Assets\Scripts\BackgroundChanger.cs" Line="7" Column="1" />
-      <File FileName="Assets\Scripts\PlayerController.cs" Line="1" Column="1" />
       <File FileName="Assets\Scripts\PhysicObject.cs" Line="1" Column="1" />
       <File FileName="Assets\Scripts\SceneLoader.cs" Line="1" Column="1" />
->>>>>>> ac23c5fc430bf657611f48c48fbc4df34d477e5d
+      <File FileName="Assets\Scripts\BackgroundChanger.cs" Line="61" Column="2" />
     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>