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

Conflicts:
	unity_Project/Assets/_Scenes/MainLevel.unity
	unity_Project/ProjectSettings/ProjectSettings.asset
	unity_Project/ProjectSettings/ProjectVersion.txt

unity_Project/Assets/0bjects/Custom Meshes/Materials.meta

@@ -0,0 +1,5 @@
+fileFormatVersion: 2
+guid: e53965623f247274780e2002b38e4018
+folderAsset: yes
+DefaultImporter:
+  userData: 

unity_Project/Assets/0bjects/Custom Meshes/Materials/lambert1.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 10d3dedc08ec5d84785659be653d1900
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/Materials/lambert10.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 9922fd6e14f48e044b3e22c2644f7398
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/Materials/lambert11.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 18664c57cb180a946ab392d9b6da72ca
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/Materials/lambert12.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: ec359fbfbee1c504e9a5d6b8fcff71eb
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/Materials/lambert13.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: f7f6012b6cd77a942b3621078e1dc5e5
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/Materials/lambert14.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 712cbcabd259c564b92ab5a8ea6ad818
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/Materials/lambert15.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 390eb031d9091b7488beff88b127a87b
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/Materials/lambert16.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 1502d9b5d3d74a54aa01bed65d7fa9ab
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/Materials/lambert17.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 987605256ed90974596ce5a7dc733b16
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/Materials/lambert18.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 3fbb96135a1cd6d4b80e7528586c470b
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/Materials/lambert19.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 9f6318d522966ce4da70bbec52158a91
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/Materials/lambert20.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: fb9e04549c534034abd0965806d88530
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/Materials/lambert21.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 6b7a3d9df89e88b4fb3663f667de0e04
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/Materials/lambert22.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 1877058bc42e3664498017db8d81184d
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/Materials/lambert23.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: e47bfd500d6dad94b9a6d0e436bac542
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/Materials/lambert24.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: a53b4bb95ab004f46ac038d03ed81ef2
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/Materials/lambert25.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: fc68953b427b3344fbdfddebd197b110
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/Materials/lambert26.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 7377011b80839844295243978537af82
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/Materials/lambert27.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 2611222eb6aefcf4187c221eb72376bd
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/Materials/lambert28.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 4d7d2b34b01021647b728ab3e171e493
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/Materials/lambert29.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 360d62ea1a69f574892774291ca2f3b3
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/Materials/lambert30.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 1f05e05b06f22c1459de54796c1372bd
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/Materials/lambert5.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 54c6dc729017bc6429c9db0a3d4a81fe
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/Materials/lambert6.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 6f7f208ac4e996e489aee650607a9c87
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/Materials/lambert7.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 09f7908a5c46d8f4ea918f17cebc2809
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/Materials/lambert8.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 7fa1f5fbd37acc94da63cff67b911bc7
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/Materials/lambert9.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 5f23b25a6748d2a478911ea8b38e2e43
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/TallFence/Materials/chainlink 1.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 6f96385a7ae585e40b2ca0855202aff4
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/TallFence/Materials/tallfence-Default 1.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 49ee01065068df14593d3fe2007c441f
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/0bjects/Terrain/Materials/lambert2.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: c399f85c2a2226841b08d847927e873d
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/Animations/Materials/lambert2.mat.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: f23cab03cd135d747a40b241aafebcad
+NativeFormatImporter:
+  userData: 

unity_Project/Assets/Character.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 30fb66684aa2b4e4f9e5a1e9131f045c
+folderAsset: yes
+timeCreated: 1442152789
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Character/Character_Animation.controller.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e8d7c249d71f47341b9ca35867c6c7bf
+timeCreated: 1442153131
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Character/Materials.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 76488da15f383ef48935526955a5afa5
+folderAsset: yes
+timeCreated: 1442152790
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/Assets/Character/Materials/lambert1.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 19a3b992490a1de41b75ec1511ce9e7b
+timeCreated: 1442152790
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

unity_Project/ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,6 @@
+<<<<<<< HEAD
 m_EditorVersion: 5.1.3f1
+=======
+m_EditorVersion: 5.2.0f3
+>>>>>>> c85d23b96e9c647da9374d868cbb9e8fe3c15aed
 m_StandardAssetsVersion: 0