diff --git a/Assets/FirstPersonView.unity b/Assets/FirstPersonView.unity
new file mode 100644
index 0000000..7c0bae2
Binary files /dev/null and b/Assets/FirstPersonView.unity differ
diff --git a/Assets/FirstPersonView.unity.meta b/Assets/FirstPersonView.unity.meta
new file mode 100644
index 0000000..97e4521
--- /dev/null
+++ b/Assets/FirstPersonView.unity.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e30c07fb6559541af858338a37440da7
+timeCreated: 1466818119
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Red_Brick_Wall.jpg b/Assets/Red_Brick_Wall.jpg
new file mode 100644
index 0000000..50767e4
Binary files /dev/null and b/Assets/Red_Brick_Wall.jpg differ
diff --git a/Assets/Red_Brick_Wall.jpg.meta b/Assets/Red_Brick_Wall.jpg.meta
new file mode 100644
index 0000000..f2ca617
--- /dev/null
+++ b/Assets/Red_Brick_Wall.jpg.meta
@@ -0,0 +1,57 @@
+fileFormatVersion: 2
+guid: 11f13d469daed41edb2648f1d1b461b2
+timeCreated: 1466818973
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 1
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 1
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 7
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: -1
+  nPOTScale: 1
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  allowsAlphaSplitting: 0
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 0
+  textureType: 1
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts.meta b/Assets/Scripts.meta
index 27e71d0..5d8d110 100644
--- a/Assets/Scripts.meta
+++ b/Assets/Scripts.meta
@@ -1,7 +1,13 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 40764ebe822b819449a2b0cf923f4c2e
 folderAsset: yes
 timeCreated: 1466858656
+=======
+guid: 585294b74b6b54cae92293ffbd3a2088
+folderAsset: yes
+timeCreated: 1466869142
+>>>>>>> 7154f75c01cc58ae5d74a82380fe1a95dca97e73
 licenseType: Free
 DefaultImporter:
   userData: 
diff --git a/Assets/Scripts/PlayerMovement.cs.meta b/Assets/Scripts/PlayerMovement.cs.meta
index 61dd72f..2bdb48f 100644
--- a/Assets/Scripts/PlayerMovement.cs.meta
+++ b/Assets/Scripts/PlayerMovement.cs.meta
@@ -1,6 +1,11 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: e02d4438d816e344abb40991894780c3
 timeCreated: 1466858657
+=======
+guid: 55ee7f3d2d53247daa31f81beccb99d8
+timeCreated: 1466869142
+>>>>>>> 7154f75c01cc58ae5d74a82380fe1a95dca97e73
 licenseType: Free
 MonoImporter:
   serializedVersion: 2
diff --git a/Assets/Scripts/ViewControl.cs.meta b/Assets/Scripts/ViewControl.cs.meta
index e9d4066..6acf3b6 100644
--- a/Assets/Scripts/ViewControl.cs.meta
+++ b/Assets/Scripts/ViewControl.cs.meta
@@ -1,6 +1,11 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: e0d46d2696637bd4994804f7b9e4d3fe
 timeCreated: 1466858657
+=======
+guid: 2c2ae6eb7fab0437791fe2f4ad415052
+timeCreated: 1466818849
+>>>>>>> 7154f75c01cc58ae5d74a82380fe1a95dca97e73
 licenseType: Free
 MonoImporter:
   serializedVersion: 2
diff --git a/Assets/TestMaterial.mat b/Assets/TestMaterial.mat
new file mode 100644
index 0000000..bab9c47
Binary files /dev/null and b/Assets/TestMaterial.mat differ
diff --git a/Assets/TestMaterial.mat.meta b/Assets/TestMaterial.mat.meta
new file mode 100644
index 0000000..cf08d4a
--- /dev/null
+++ b/Assets/TestMaterial.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 852c4d218cedd4ae5b088ddcdedccad4
+timeCreated: 1466818559
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: