Resolving conflicts.

Assets/CameraController.cs

@@ -1,20 +0,0 @@
-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;
-	}
-}