Resolving diff's from merge

CMPT306_Fall2017/Assets/Scenes/CMPT306_Fall2017.unity

@@ -208,7 +208,6 @@ Transform:
   m_LocalScale: {x: 21.288282, y: -0.827292, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-<<<<<<< HEAD:CMPT306_Fall2017/Assets/CMPT306_Fall2017.unity
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &539924686
@@ -243,9 +242,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 1941051258}
   m_RootOrder: 2
-=======
-  m_RootOrder: 4
->>>>>>> develop:CMPT306_Fall2017/Assets/Scenes/CMPT306_Fall2017.unity
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &568827984
 Prefab:
@@ -284,11 +280,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4504003809388494, guid: 5eed0066b4268c14887ebeafd95873f0, type: 2}
       propertyPath: m_RootOrder
-<<<<<<< HEAD:CMPT306_Fall2017/Assets/CMPT306_Fall2017.unity
       value: 2
-=======
-      value: 0
->>>>>>> develop:CMPT306_Fall2017/Assets/Scenes/CMPT306_Fall2017.unity
       objectReference: {fileID: 0}
     - target: {fileID: 114941791273446218, guid: 5eed0066b4268c14887ebeafd95873f0,
         type: 2}
@@ -398,7 +390,6 @@ Transform:
   m_LocalScale: {x: 21.288544, y: 0.58124524, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-<<<<<<< HEAD:CMPT306_Fall2017/Assets/CMPT306_Fall2017.unity
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &967917388
@@ -615,9 +606,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 1941051258}
   m_RootOrder: 3
-=======
-  m_RootOrder: 1
->>>>>>> develop:CMPT306_Fall2017/Assets/Scenes/CMPT306_Fall2017.unity
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1154437410
 GameObject:
@@ -688,7 +676,6 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: -1}
   m_Children: []
   m_Father: {fileID: 0}
-<<<<<<< HEAD:CMPT306_Fall2017/Assets/CMPT306_Fall2017.unity
   m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1296616206
@@ -883,9 +870,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 1374445134}
   m_RootOrder: 0
-=======
-  m_RootOrder: 5
->>>>>>> develop:CMPT306_Fall2017/Assets/Scenes/CMPT306_Fall2017.unity
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1501078556
 GameObject:
@@ -1043,11 +1027,7 @@ Transform:
   m_LocalScale: {x: 0.48638585, y: 7.7381415, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-<<<<<<< HEAD:CMPT306_Fall2017/Assets/CMPT306_Fall2017.unity
   m_RootOrder: 4
-=======
-  m_RootOrder: 2
->>>>>>> develop:CMPT306_Fall2017/Assets/Scenes/CMPT306_Fall2017.unity
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1704310603
 GameObject:
@@ -1144,7 +1124,6 @@ Transform:
   m_LocalScale: {x: -0.3519798, y: 8.004621, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-<<<<<<< HEAD:CMPT306_Fall2017/Assets/CMPT306_Fall2017.unity
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1792611675
@@ -1174,9 +1153,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 1374445134}
   m_RootOrder: 1
-=======
-  m_RootOrder: 3
->>>>>>> develop:CMPT306_Fall2017/Assets/Scenes/CMPT306_Fall2017.unity
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1805919923
 Prefab:

CMPT306_Fall2017/Assets/Scripts/PlayerCameraScript.cs

@@ -71,11 +71,6 @@ public class PlayerCameraScript : MonoBehaviour
     // Update is called once per frame
     void FixedUpdate()
     {
-<<<<<<< HEAD
-       // Debug.Log("Moving Camera...");
-
-=======
->>>>>>> develop
         CameraTracking();
         //myCamera.transform.position += ZAdjustVect;
         //myCamera.transform.position += PlayerYAdjustVect;

CMPT306_Fall2017/ProjectSettings/Physics2DSettings.asset

@@ -4,16 +4,16 @@
 Physics2DSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 3
-  m_Gravity: {x: 0, y: 0}
+  m_Gravity: {x: 0, y: -9.81}
   m_DefaultMaterial: {fileID: 0}
-  m_VelocityIterations: 500
-  m_PositionIterations: 500
+  m_VelocityIterations: 8
+  m_PositionIterations: 3
   m_VelocityThreshold: 1
   m_MaxLinearCorrection: 0.2
   m_MaxAngularCorrection: 8
   m_MaxTranslationSpeed: 100
   m_MaxRotationSpeed: 360
-  m_BaumgarteScale: 0.1
+  m_BaumgarteScale: 0.2
   m_BaumgarteTimeOfImpactScale: 0.75
   m_TimeToSleep: 0.5
   m_LinearSleepTolerance: 0.01
@@ -33,8 +33,4 @@ Physics2DSettings:
   m_ColliderAsleepColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.36078432}
   m_ColliderContactColor: {r: 1, g: 0, b: 1, a: 0.6862745}
   m_ColliderAABBColor: {r: 1, g: 1, b: 0, a: 0.2509804}
-<<<<<<< HEAD
-  m_LayerCollisionMatrix: fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-=======
-  m_LayerCollisionMatrix: fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdfffffffcffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
->>>>>>> develop
+  m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

CMPT306_Fall2017/ProjectSettings/TagManager.asset

@@ -4,13 +4,6 @@
 TagManager:
   serializedVersion: 2
   tags:
-  - Barrier
-  - Door
-  - DoorN
-  - DoorE
-  - DoorS
-  - DoorW
-  - Walls
   - TetherLink
   layers:
   - Default
@@ -21,13 +14,8 @@ TagManager:
   - UI
   - 
   - 
-<<<<<<< HEAD
-  - Enemy
   - 
-=======
-  - Player
-  - Tether
->>>>>>> develop
+  - 
   - 
   - 
   -