Merge branch 'master' of https://bitbucket.org/JoshuaReason/project-junker

Conflicts:
	unity_Project/Assets/_Scenes/MainLevel.unity

unity_Project/Assets/0bjects/Textures/Credits Textures.meta~HEAD

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 93c6fe7644c3dd249ae67cfc5ef62f4f
+folderAsset: yes
+timeCreated: 1444816934
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/0bjects/Textures/Credits Textures.meta~HEAD.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 18002ecada6fcf74db33422cdf6b45e3
+timeCreated: 1444977403
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_3D_objects.png.meta

@@ -1,6 +1,11 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: 73807885af79f08409af8cfa504f151d
+timeCreated: 1444816941
+=======
 guid: 5229931a887da744f8b143d3a3b6ebe2
 timeCreated: 1444963987
+>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}

unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Jeffrey.png.meta

@@ -1,6 +1,11 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: 5760e5b6217f00f43aa7284f88d673e0
+timeCreated: 1444816940
+=======
 guid: 508669a15aa596e4fb31b64a9ef0358a
 timeCreated: 1444963986
+>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}

unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Joshua.png.meta

@@ -1,6 +1,11 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: ffd886b811d09e246bcf9cef7b5300da
+timeCreated: 1444816946
+=======
 guid: 6923f83b6752ee24fab936c70fbdb3f6
 timeCreated: 1444963989
+>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}

unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_LOGO.png.meta

@@ -1,6 +1,11 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: 5d2c4f9f4d2c70c43a5015441363ec60
+timeCreated: 1444816940
+=======
 guid: 436e1c01cabf71846b68ffe62d16676f
 timeCreated: 1444963986
+>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}

unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Lachlan.png.meta

@@ -1,6 +1,11 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: c0789dc7df957234fab515bd76187cd5
+timeCreated: 1444816942
+=======
 guid: f91640ab040168b41ac708a606406911
 timeCreated: 1444963993
+>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}

unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Simon.png.meta

@@ -1,6 +1,11 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: f689cf6e913fffe468423a391aedcbe4
+timeCreated: 1444816946
+=======
 guid: 5f52597b29f3415468d182d4708a845c
 timeCreated: 1444963988
+>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}

unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_art_assets.png.meta

@@ -1,6 +1,11 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: dd8a665a21c72e046b21eb37d166dcb6
+timeCreated: 1444816945
+=======
 guid: 17e151b8ca0b54c47b00504bf33440e9
 timeCreated: 1444963984
+>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}

unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_developed.png.meta

@@ -1,6 +1,11 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: 225357fdc7247dc4487fa33e7005859b
+timeCreated: 1444816939
+=======
 guid: 854f5a0b19b8d874b851336cdbd51df1
 timeCreated: 1444963991
+>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}

unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_sound.png.meta

@@ -1,6 +1,11 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: 7cf2ef30927a7034fa6853a71c90f81f
+timeCreated: 1444816942
+=======
 guid: 6eb3f04d86801894b8bb4d8ee0801837
 timeCreated: 1444963990
+>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}

unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_text.png.meta

@@ -1,6 +1,11 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: 93e3d399ed60aec4c81447df937219eb
+timeCreated: 1444816942
+=======
 guid: d5b6678e6c800594d987a459a36dff49
 timeCreated: 1444963992
+>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}

unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_trailer.png.meta

@@ -1,6 +1,11 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: 950f1640e3b96a04e90f56f29c4ab3aa
+timeCreated: 1444970305
+=======
 guid: 4217b02130105354b8bf5cb48e701efc
 timeCreated: 1444963985
+>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}

unity_Project/Assets/Fonts.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 5629de68fc927c74da741f808f175add
+folderAsset: yes
+timeCreated: 1444975270
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Fonts/MotionControl-Bold.otf.meta

@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: b929c126c43e9ab4d816cc240f297c0f
+timeCreated: 1444975270
+licenseType: Free
+TrueTypeFontImporter:
+  serializedVersion: 2
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 1
+  characterPadding: 0
+  includeFontData: 1
+  use2xBehaviour: 0
+  fontNames: []
+  customCharacters: 
+  fontRenderingMode: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 139518c3564a5fa4b91d3b9137dd97a0
-timeCreated: 1444963983
-licenseType: Free
+guid: e2273b98b70b41c4789399af71b0160e
 TextureImporter:
   fileIDToRecycleName: {}
   serializedVersion: 2
@@ -30,22 +28,22 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     filterMode: -1
-    aniso: -1
+    aniso: 16
     mipBias: -1
-    wrapMode: -1
-  nPOTScale: 1
+    wrapMode: 1
+  nPOTScale: 0
   lightmap: 0
   rGBM: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: .5, y: .5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
-  alphaIsTransparency: 0
-  textureType: -1
+  alphaIsTransparency: 1
+  textureType: 8
   buildTargetSettings: []
   spriteSheet:
     sprites: []

unity_Project/Assets/GUI Assets/buttons.meta

@@ -1,7 +1,13 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: e05209d25db06c14e89ac6899807685a
+folderAsset: yes
+timeCreated: 1444970301
+=======
 guid: 246270fcdb8756147a17ddeacc523eaf
 folderAsset: yes
 timeCreated: 1444963981
+>>>>>>> 0b8a556b660ab6c52b873fddc2fbb36202961789
 licenseType: Free
 DefaultImporter:
   userData: 

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

@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: 03fe9bcd1afa0ab44883a90a8d4dd211
+timeCreated: 1444974404
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: 16
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: 52e2c5ed0b739c14aad485429f82d500
+timeCreated: 1444974405
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: 16
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: c6ed5502d45191d409f13d94ae605f98
-timeCreated: 1444963991
-licenseType: Free
+guid: 68ac929074196e04eaa1c95cb34eb5f8
 TextureImporter:
   fileIDToRecycleName: {}
   serializedVersion: 2
@@ -30,22 +28,22 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     filterMode: -1
-    aniso: -1
+    aniso: 16
     mipBias: -1
-    wrapMode: -1
-  nPOTScale: 1
+    wrapMode: 1
+  nPOTScale: 0
   lightmap: 0
   rGBM: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: .5, y: .5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
-  alphaIsTransparency: 0
-  textureType: -1
+  alphaIsTransparency: 1
+  textureType: 8
   buildTargetSettings: []
   spriteSheet:
     sprites: []

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

@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: 35c2f87b938d7a74e941f483af34ed06
+timeCreated: 1444974405
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: 16
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: ed1d3d6c58fca874aa1332a2dafdbbb4
-timeCreated: 1444963992
-licenseType: Free
+guid: cd2159db50f67e043b760e4b9e378ceb
 TextureImporter:
   fileIDToRecycleName: {}
   serializedVersion: 2
@@ -30,22 +28,22 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     filterMode: -1
-    aniso: -1
+    aniso: 16
     mipBias: -1
-    wrapMode: -1
-  nPOTScale: 1
+    wrapMode: 1
+  nPOTScale: 0
   lightmap: 0
   rGBM: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: .5, y: .5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
-  alphaIsTransparency: 0
-  textureType: -1
+  alphaIsTransparency: 1
+  textureType: 8
   buildTargetSettings: []
   spriteSheet:
     sprites: []

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

@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: 4a7d97a86f9f1e8449d4e2197247c5d1
+timeCreated: 1444974405
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: 16
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: c93aa9271dee1bf4191b97da38a4e5de
-timeCreated: 1444963991
-licenseType: Free
+guid: 0952d26219807984d81378f2b93cd120
 TextureImporter:
   fileIDToRecycleName: {}
   serializedVersion: 2
@@ -30,22 +28,22 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     filterMode: -1
-    aniso: -1
+    aniso: 16
     mipBias: -1
-    wrapMode: -1
-  nPOTScale: 1
+    wrapMode: 1
+  nPOTScale: 0
   lightmap: 0
   rGBM: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: .5, y: .5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
-  alphaIsTransparency: 0
-  textureType: -1
+  alphaIsTransparency: 1
+  textureType: 8
   buildTargetSettings: []
   spriteSheet:
     sprites: []

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

@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: 435e7ab930504b541a763fd43b9e56bf
+timeCreated: 1444974405
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: 16
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 0d349f824e5ba244ca80b1ef5e856f8b
-timeCreated: 1444963982
-licenseType: Free
+guid: efeaa4c9cf64299478579c7bb54ef9af
 TextureImporter:
   fileIDToRecycleName: {}
   serializedVersion: 2
@@ -30,22 +28,22 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     filterMode: -1
-    aniso: -1
+    aniso: 16
     mipBias: -1
-    wrapMode: -1
-  nPOTScale: 1
+    wrapMode: 1
+  nPOTScale: 0
   lightmap: 0
   rGBM: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: .5, y: .5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
-  alphaIsTransparency: 0
-  textureType: -1
+  alphaIsTransparency: 1
+  textureType: 8
   buildTargetSettings: []
   spriteSheet:
     sprites: []

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

@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: 14bb7e22f0743b54cb8bfee07b2ab6b0
+timeCreated: 1444974405
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: 16
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 197e17f17bcf50244923c00c199cfb80
-timeCreated: 1444963984
-licenseType: Free
+guid: 0d71b952815265d469069b89f501a43c
 TextureImporter:
   fileIDToRecycleName: {}
   serializedVersion: 2
@@ -30,22 +28,22 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     filterMode: -1
-    aniso: -1
+    aniso: 16
     mipBias: -1
-    wrapMode: -1
-  nPOTScale: 1
+    wrapMode: 1
+  nPOTScale: 0
   lightmap: 0
   rGBM: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: .5, y: .5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
-  alphaIsTransparency: 0
-  textureType: -1
+  alphaIsTransparency: 1
+  textureType: 8
   buildTargetSettings: []
   spriteSheet:
     sprites: []

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

@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: dbd8216062710be42b97af992ea14ab8
+timeCreated: 1444974405
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: 16
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Textures.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 97def69cc8aa8f0458d67929f23873dd
+folderAsset: yes
+timeCreated: 1444371283
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 5.1.2f1
+m_EditorVersion: 5.1.3f1
 m_StandardAssetsVersion: 0