Resolving conflicts.

Assets/Scripts/CameraController.cs

@@ -0,0 +1,20 @@
+using UnityEngine;
+using System.Collections;
+
+public class CameraController : MonoBehaviour {
+
+	public GameObject player;
+	private Vector3 offset;
+	
+	// Use this for initialization
+	void Start () 
+	{
+		offset = transform.position;
+	}
+	
+	// Update is called once per frame
+	void LateUpdate () 
+	{
+		transform.position = player.transform.position + offset;
+	}
+}

Assets/Scripts/CameraController.cs.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ae2ca4205f0f47a4fa626bd81ae8c2da
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 

Assets/Scripts/ShankTimer.cs

@@ -0,0 +1,21 @@
+using UnityEngine;
+using System.Collections;
+
+public class ShankTimer : MonoBehaviour {
+
+	private float timer;
+	public float length;
+
+	// Use this for initialization
+	void Start () {
+		timer = 0f;
+	}
+	
+	// Update is called once per frame
+	void Update () {
+		timer += Time.deltaTime;
+
+		if (timer > length)
+			GameObject.Destroy (gameObject);
+	}
+}

Assets/Scripts/ShankTimer.cs.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 025a712113e797c408ae9865e9ac79c6
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: