Resolved merge conflicts. Title Screen works as well as credits scene

unity_Project/Assets/GUI Assets/UI_credits.png.meta

@@ -1,12 +1,5 @@
 fileFormatVersion: 2
-<<<<<<< HEAD
 guid: e2273b98b70b41c4789399af71b0160e
-timeCreated: 1444970306
-=======
-guid: 139518c3564a5fa4b91d3b9137dd97a0
-timeCreated: 1444963983
->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
-licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}
   serializedVersion: 2
@@ -35,7 +28,6 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     filterMode: -1
-<<<<<<< HEAD
     aniso: 16
     mipBias: -1
     wrapMode: 1
@@ -44,29 +36,14 @@ TextureImporter:
   rGBM: 0
   compressionQuality: 50
   spriteMode: 1
-=======
-    aniso: -1
-    mipBias: -1
-    wrapMode: -1
-  nPOTScale: 1
-  lightmap: 0
-  rGBM: 0
-  compressionQuality: 50
-  spriteMode: 0
->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: .5, y: .5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
-<<<<<<< HEAD
   alphaIsTransparency: 1
   textureType: 8
-=======
-  alphaIsTransparency: 0
-  textureType: -1
->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
   buildTargetSettings: []
   spriteSheet:
     sprites: []

unity_Project/Assets/GUI Assets/buttons/btn_continue.png.meta

@@ -1,12 +1,5 @@
 fileFormatVersion: 2
-<<<<<<< HEAD
 guid: 68ac929074196e04eaa1c95cb34eb5f8
-timeCreated: 1444970304
-=======
-guid: c6ed5502d45191d409f13d94ae605f98
-timeCreated: 1444963991
->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
-licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}
   serializedVersion: 2
@@ -35,7 +28,6 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     filterMode: -1
-<<<<<<< HEAD
     aniso: 16
     mipBias: -1
     wrapMode: 1
@@ -44,29 +36,14 @@ TextureImporter:
   rGBM: 0
   compressionQuality: 50
   spriteMode: 1
-=======
-    aniso: -1
-    mipBias: -1
-    wrapMode: -1
-  nPOTScale: 1
-  lightmap: 0
-  rGBM: 0
-  compressionQuality: 50
-  spriteMode: 0
->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: .5, y: .5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
-<<<<<<< HEAD
   alphaIsTransparency: 1
   textureType: 8
-=======
-  alphaIsTransparency: 0
-  textureType: -1
->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
   buildTargetSettings: []
   spriteSheet:
     sprites: []

unity_Project/Assets/GUI Assets/buttons/btn_credits.png.meta

@@ -1,12 +1,5 @@
 fileFormatVersion: 2
-<<<<<<< HEAD
 guid: cd2159db50f67e043b760e4b9e378ceb
-timeCreated: 1444970305
-=======
-guid: ed1d3d6c58fca874aa1332a2dafdbbb4
-timeCreated: 1444963992
->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
-licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}
   serializedVersion: 2
@@ -35,7 +28,6 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     filterMode: -1
-<<<<<<< HEAD
     aniso: 16
     mipBias: -1
     wrapMode: 1
@@ -44,29 +36,14 @@ TextureImporter:
   rGBM: 0
   compressionQuality: 50
   spriteMode: 1
-=======
-    aniso: -1
-    mipBias: -1
-    wrapMode: -1
-  nPOTScale: 1
-  lightmap: 0
-  rGBM: 0
-  compressionQuality: 50
-  spriteMode: 0
->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: .5, y: .5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
-<<<<<<< HEAD
   alphaIsTransparency: 1
   textureType: 8
-=======
-  alphaIsTransparency: 0
-  textureType: -1
->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
   buildTargetSettings: []
   spriteSheet:
     sprites: []

unity_Project/Assets/GUI Assets/buttons/btn_exit.png.meta

@@ -1,12 +1,5 @@
 fileFormatVersion: 2
-<<<<<<< HEAD
 guid: 0952d26219807984d81378f2b93cd120
-timeCreated: 1444970304
-=======
-guid: c93aa9271dee1bf4191b97da38a4e5de
-timeCreated: 1444963991
->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
-licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}
   serializedVersion: 2
@@ -35,7 +28,6 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     filterMode: -1
-<<<<<<< HEAD
     aniso: 16
     mipBias: -1
     wrapMode: 1
@@ -44,29 +36,14 @@ TextureImporter:
   rGBM: 0
   compressionQuality: 50
   spriteMode: 1
-=======
-    aniso: -1
-    mipBias: -1
-    wrapMode: -1
-  nPOTScale: 1
-  lightmap: 0
-  rGBM: 0
-  compressionQuality: 50
-  spriteMode: 0
->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: .5, y: .5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
-<<<<<<< HEAD
   alphaIsTransparency: 1
   textureType: 8
-=======
-  alphaIsTransparency: 0
-  textureType: -1
->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
   buildTargetSettings: []
   spriteSheet:
     sprites: []

unity_Project/Assets/GUI Assets/buttons/btn_new_game.png.meta

@@ -1,12 +1,5 @@
 fileFormatVersion: 2
-<<<<<<< HEAD
 guid: efeaa4c9cf64299478579c7bb54ef9af
-timeCreated: 1444970306
-=======
-guid: 0d349f824e5ba244ca80b1ef5e856f8b
-timeCreated: 1444963982
->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
-licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}
   serializedVersion: 2
@@ -35,7 +28,6 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     filterMode: -1
-<<<<<<< HEAD
     aniso: 16
     mipBias: -1
     wrapMode: 1
@@ -44,29 +36,14 @@ TextureImporter:
   rGBM: 0
   compressionQuality: 50
   spriteMode: 1
-=======
-    aniso: -1
-    mipBias: -1
-    wrapMode: -1
-  nPOTScale: 1
-  lightmap: 0
-  rGBM: 0
-  compressionQuality: 50
-  spriteMode: 0
->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: .5, y: .5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
-<<<<<<< HEAD
   alphaIsTransparency: 1
   textureType: 8
-=======
-  alphaIsTransparency: 0
-  textureType: -1
->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
   buildTargetSettings: []
   spriteSheet:
     sprites: []

unity_Project/Assets/GUI Assets/buttons/btn_settings.png.meta

@@ -1,12 +1,5 @@
 fileFormatVersion: 2
-<<<<<<< HEAD
 guid: 0d71b952815265d469069b89f501a43c
-timeCreated: 1444970304
-=======
-guid: 197e17f17bcf50244923c00c199cfb80
-timeCreated: 1444963984
->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
-licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}
   serializedVersion: 2
@@ -35,7 +28,6 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     filterMode: -1
-<<<<<<< HEAD
     aniso: 16
     mipBias: -1
     wrapMode: 1
@@ -44,29 +36,14 @@ TextureImporter:
   rGBM: 0
   compressionQuality: 50
   spriteMode: 1
-=======
-    aniso: -1
-    mipBias: -1
-    wrapMode: -1
-  nPOTScale: 1
-  lightmap: 0
-  rGBM: 0
-  compressionQuality: 50
-  spriteMode: 0
->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: .5, y: .5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
-<<<<<<< HEAD
   alphaIsTransparency: 1
   textureType: 8
-=======
-  alphaIsTransparency: 0
-  textureType: -1
->>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
   buildTargetSettings: []
   spriteSheet:
     sprites: []