Scripts added to travel scene + "spawn" ;)

Zookeepers Trial/Assembly-CSharp.csproj

@@ -55,6 +55,8 @@
      <Compile Include="Assets\Scripts\EnemyHealth.cs" />
      <Compile Include="Assets\Scripts\EnterDoor.cs" />
      <Compile Include="Assets\Scripts\InBetween.cs" />
+     <Compile Include="Assets\Scripts\InBetweenAI.cs" />
+     <Compile Include="Assets\Scripts\InBetweenCamera.cs" />
      <Compile Include="Assets\Scripts\MainMenu.cs" />
      <Compile Include="Assets\Scripts\Money.cs" />
      <Compile Include="Assets\Scripts\PlayerHealth.cs" />

Zookeepers Trial/Assets/Scripts/InBetweenAI.cs.meta

+fileFormatVersion: 2
+guid: db0a489c0d9e2994fab535cb012aafda
+timeCreated: 1480118655
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Zookeepers Trial/Assets/Scripts/InBetweenCamera.cs.meta

+fileFormatVersion: 2
+guid: 28323f24d85c06a459e057971ac4e05e
+timeCreated: 1480118655
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Zookeepers Trial/Assets/Scripts/RandomPlatforms.cs.meta

+fileFormatVersion: 2
+guid: 21a3c448383989d42b84da4d100a3d89
+timeCreated: 1480118655
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Zookeepers Trial/Library/LastSceneManagerSetup.txt

 sceneSetups:
-<<<<<<< HEAD
-- path: Assets/Scenes/shopBlacksmith.unity
-=======
-- path: Assets/Scenes/Town01ToTown02.unity
->>>>>>> origin/master
+- path: Assets/Scenes/Town01.unity
   isLoaded: 1
   isActive: 1