diff --git a/Assets/FloorCreator.meta b/Assets/FloorCreator.meta
new file mode 100644
index 0000000..612cf8c
--- /dev/null
+++ b/Assets/FloorCreator.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: ffcd72de038e9f64c91bcacaf61c3584
+folderAsset: yes
+timeCreated: 1477838992
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/FloorCreator/Father.prefab b/Assets/FloorCreator/Father.prefab
new file mode 100644
index 0000000..bc51618
--- /dev/null
+++ b/Assets/FloorCreator/Father.prefab
@@ -0,0 +1,92 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1000011495271182}
+  m_IsPrefabParent: 1
+--- !u!1 &1000011495271182
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 4000011579287534}
+  - 33: {fileID: 33000010716199292}
+  - 65: {fileID: 65000012841509122}
+  - 23: {fileID: 23000013877990604}
+  m_Layer: 0
+  m_Name: Father
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4000011579287534
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1000011495271182}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+--- !u!23 &23000013877990604
+MeshRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1000011495271182}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_Materials:
+  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  m_SubsetIndices: 
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 1
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_SelectedWireframeHidden: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+--- !u!33 &33000010716199292
+MeshFilter:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1000011495271182}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!65 &65000012841509122
+BoxCollider:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1000011495271182}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
diff --git a/Assets/FloorCreator/Father.prefab.meta b/Assets/FloorCreator/Father.prefab.meta
new file mode 100644
index 0000000..6a5c11a
--- /dev/null
+++ b/Assets/FloorCreator/Father.prefab.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 76fffd23e9027e347bad342ef89456f9
+timeCreated: 1477743954
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/FloorCreator/FloorCreator.prefab b/Assets/FloorCreator/FloorCreator.prefab
new file mode 100644
index 0000000..599ae77
--- /dev/null
+++ b/Assets/FloorCreator/FloorCreator.prefab
@@ -0,0 +1,69 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1000013182272914}
+  m_IsPrefabParent: 1
+--- !u!1 &1000013182272914
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 4000011966173314}
+  - 114: {fileID: 114000013328815932}
+  m_Layer: 0
+  m_Name: FloorCreator
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4000011966173314
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1000013182272914}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.82340044, y: 3.3069942, z: -5.0329347}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+--- !u!114 &114000013328815932
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1000013182272914}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2f46523907ab5e348b0cd6200ec9e6ee, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  basic_floor: {fileID: 1000011495271182, guid: 884954c970b51ca4d9c3f5b47d59a2c5,
+    type: 2}
+  basic_floor_father: {fileID: 1000011495271182, guid: 76fffd23e9027e347bad342ef89456f9,
+    type: 2}
+  nhabitable_floor: {fileID: 1000013422381662, guid: dd4679e61b0d25848aa2088bfeaa13e0,
+    type: 2}
+  light_form: {fileID: 1000010428274642, guid: 3ef491365c1c7de4b9eacacd54de259f, type: 2}
+  texture_floor:
+  - {fileID: 2800000, guid: 3377fca7e6042b64f99e0a68b4db477b, type: 3}
+  - {fileID: 2800000, guid: 14f79ddfb22057946a2c291df17dd8b8, type: 3}
+  - {fileID: 2800000, guid: 31a253788168630499ae578dcb0ed210, type: 3}
+  - {fileID: 2800000, guid: 82f65049e51ea6941a665212fe066852, type: 3}
+  - {fileID: 2800000, guid: d75275069863fe6419773a55d238d307, type: 3}
+  texture_wall:
+  - {fileID: 2800000, guid: 2dc8ddddeadc22f49bb3ea299209af95, type: 3}
+  - {fileID: 2800000, guid: c852064376819694f9e8961d5fc2d92a, type: 3}
diff --git a/Assets/FloorCreator/FloorCreator.prefab.meta b/Assets/FloorCreator/FloorCreator.prefab.meta
new file mode 100644
index 0000000..aead105
--- /dev/null
+++ b/Assets/FloorCreator/FloorCreator.prefab.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9fe758e4b61ec0d4dbdd8b92521a6628
+timeCreated: 1477758385
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/FloorCreator/GlobalLight.prefab b/Assets/FloorCreator/GlobalLight.prefab
new file mode 100644
index 0000000..d9b5c71
--- /dev/null
+++ b/Assets/FloorCreator/GlobalLight.prefab
@@ -0,0 +1,76 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1000010428274642}
+  m_IsPrefabParent: 1
+--- !u!1 &1000010428274642
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 4000013062699570}
+  - 108: {fileID: 108000012673051402}
+  m_Layer: 0
+  m_Name: GlobalLight
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4000013062699570
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1000010428274642}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 3, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+--- !u!108 &108000012673051402
+Light:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1000010428274642}
+  m_Enabled: 1
+  serializedVersion: 7
+  m_Type: 1
+  m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
+  m_Intensity: 1
+  m_Range: 10
+  m_SpotAngle: 30
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 2
+    m_Resolution: -1
+    m_CustomResolution: -1
+    m_Strength: 1
+    m_Bias: 0.05
+    m_NormalBias: 0.4
+    m_NearPlane: 0.2
+  m_Cookie: {fileID: 0}
+  m_DrawHalo: 0
+  m_Flare: {fileID: 0}
+  m_RenderMode: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_Lightmapping: 4
+  m_AreaSize: {x: 1, y: 1}
+  m_BounceIntensity: 1
+  m_ShadowRadius: 0
+  m_ShadowAngle: 0
diff --git a/Assets/FloorCreator/GlobalLight.prefab.meta b/Assets/FloorCreator/GlobalLight.prefab.meta
new file mode 100644
index 0000000..24637d8
--- /dev/null
+++ b/Assets/FloorCreator/GlobalLight.prefab.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3ef491365c1c7de4b9eacacd54de259f
+timeCreated: 1477883197
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/FloorCreator/Habitable.prefab b/Assets/FloorCreator/Habitable.prefab
new file mode 100644
index 0000000..f5f4f55
--- /dev/null
+++ b/Assets/FloorCreator/Habitable.prefab
@@ -0,0 +1,92 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1000011495271182}
+  m_IsPrefabParent: 1
+--- !u!1 &1000011495271182
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 4000011579287534}
+  - 33: {fileID: 33000010716199292}
+  - 65: {fileID: 65000012841509122}
+  - 23: {fileID: 23000013877990604}
+  m_Layer: 0
+  m_Name: Habitable
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4000011579287534
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1000011495271182}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+--- !u!23 &23000013877990604
+MeshRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1000011495271182}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_Materials:
+  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  m_SubsetIndices: 
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 1
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_SelectedWireframeHidden: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+--- !u!33 &33000010716199292
+MeshFilter:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1000011495271182}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!65 &65000012841509122
+BoxCollider:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1000011495271182}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
diff --git a/Assets/FloorCreator/Habitable.prefab.meta b/Assets/FloorCreator/Habitable.prefab.meta
new file mode 100644
index 0000000..4c13825
--- /dev/null
+++ b/Assets/FloorCreator/Habitable.prefab.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 884954c970b51ca4d9c3f5b47d59a2c5
+timeCreated: 1477743954
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/FloorCreator/MapCreation.cs b/Assets/FloorCreator/MapCreation.cs
new file mode 100644
index 0000000..dd3b139
--- /dev/null
+++ b/Assets/FloorCreator/MapCreation.cs
@@ -0,0 +1,68 @@
+using UnityEngine;
+using System.Collections;
+/**
+ * Este generador de mapas solo funciona para rectangulos uniformes.
+ * 
+ * */
+public class MapCreation : MonoBehaviour {
+
+	private int tf = 5; 	//Cantidad de texturas de suelo
+	private int tw = 2; 	//Cantidad de texturas de pared
+	private int vs = 20;	//Tamano vertical del mapa
+	private int hs = 40;	//Tamano horizontal del mapa
+	private Vector3 lf;		//Light facing
+	private float li;		//Light intensity
+	private Color lc;		//Light color
+	public int[,] matrix; 	//0 a 5 		: zona habitable
+							//Diferente de 0: zona no habitable
+
+	public GameObject basic_floor;		//Plataforma basica
+	public GameObject basic_floor_father;	//Ancla para los suelos
+	public GameObject nhabitable_floor;	//Objecto de zona no habitable
+	public GameObject light_form;
+
+	public Texture2D[] texture_floor;	//Vector con las texturas del suelo
+	public Texture2D[] texture_wall;	//Vector con las texturas de las paredes
+
+	void Start () {
+		//Variable de instancia temporal
+		GameObject basic_instance = Instantiate(light_form,new Vector3(0,5,0), Quaternion.identity) as GameObject;
+		basic_instance.transform.Rotate (lf);
+		basic_instance.GetComponent<Light> ().color = lc;
+		basic_instance.GetComponent<Light> ().intensity = li;
+		basic_instance = Instantiate(basic_floor_father, new Vector3(0,0,0), Quaternion.identity) as GameObject;
+		int pos;
+		GameObject basic_floor_instance;
+		for(int i = 0; i < vs; i++){
+			for(int j = 0; j < hs; j++){
+				pos = matrix [i, j];
+				if (0 <= pos && pos < 5){
+					basic_floor_instance = Instantiate (basic_floor, new Vector3 (i, -0.5f, j), Quaternion.identity) as GameObject;
+					basic_floor_instance.GetComponent<Renderer>().material.mainTexture = texture_floor [pos];
+				}
+				else //if (pos != 0) 
+				{
+					basic_floor_instance = Instantiate (nhabitable_floor, new Vector3 (i, 0.5f, j), Quaternion.identity) as GameObject;
+					basic_floor_instance.GetComponent<Renderer>().material.mainTexture = texture_wall [i % 2];
+				}
+				basic_floor_instance.transform.parent = basic_instance.transform;
+			}
+		}
+	}
+
+	private void loadTextures(){
+		texture_floor = new Texture2D[tf];
+		texture_wall = new Texture2D[tw];
+		//Carga de las texturas
+		for (int i = 0; i < tf; i++)
+			texture_floor[i] = Resources.Load ("/FloorCreator/imported_texture/Floor" + i.ToString ()) as Texture2D;
+		for (int i = 0; i < tw; i++)
+			texture_wall[i] = Resources.Load ("/FloorCreator/imported_texture/Wall" + i.ToString ()) as Texture2D;
+	}
+
+	public void setMatrix(int[,] new_floor, int x, int z, Vector3 light, float light_intensity, Color light_color){
+		matrix = new_floor;
+		vs = x; hs = z;
+		lf = light; li = light_intensity; lc = light_color;
+	}
+}
\ No newline at end of file
diff --git a/Assets/FloorCreator/MapCreation.cs.meta b/Assets/FloorCreator/MapCreation.cs.meta
new file mode 100644
index 0000000..91357aa
--- /dev/null
+++ b/Assets/FloorCreator/MapCreation.cs.meta
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: 2f46523907ab5e348b0cd6200ec9e6ee
+timeCreated: 1477840263
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences:
+  - basic_floor: {instanceID: 0}
+  - basic_floor_father: {instanceID: 0}
+  - nhabitable_floor: {instanceID: 0}
+  - light_form: {instanceID: 0}
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/FloorCreator/NoHabitable.prefab b/Assets/FloorCreator/NoHabitable.prefab
new file mode 100644
index 0000000..ede3b83
--- /dev/null
+++ b/Assets/FloorCreator/NoHabitable.prefab
@@ -0,0 +1,92 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1000013422381662}
+  m_IsPrefabParent: 1
+--- !u!1 &1000013422381662
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 4000010361689488}
+  - 33: {fileID: 33000012450969954}
+  - 65: {fileID: 65000010885683642}
+  - 23: {fileID: 23000012589002856}
+  m_Layer: 0
+  m_Name: NoHabitable
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4000010361689488
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1000013422381662}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 3, z: 1}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+--- !u!23 &23000012589002856
+MeshRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1000013422381662}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_Materials:
+  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  m_SubsetIndices: 
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 1
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_SelectedWireframeHidden: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+--- !u!33 &33000012450969954
+MeshFilter:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1000013422381662}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!65 &65000010885683642
+BoxCollider:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1000013422381662}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
diff --git a/Assets/FloorCreator/NoHabitable.prefab.meta b/Assets/FloorCreator/NoHabitable.prefab.meta
new file mode 100644
index 0000000..ae0097f
--- /dev/null
+++ b/Assets/FloorCreator/NoHabitable.prefab.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dd4679e61b0d25848aa2088bfeaa13e0
+timeCreated: 1477758378
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/FloorCreator/TestController.cs b/Assets/FloorCreator/TestController.cs
new file mode 100644
index 0000000..511e2a4
--- /dev/null
+++ b/Assets/FloorCreator/TestController.cs
@@ -0,0 +1,25 @@
+using UnityEngine;
+using System.Collections;
+
+public class TestController : MonoBehaviour {
+	public GameObject generator;
+	// Use this for initialization
+	void Start () {
+		int[,] matrix = new int[,]{
+			{3,3,3,3,3,3},
+			{3,1,1,1,1,3},
+			{3,1,2,2,1,3},
+			{4,1,2,2,1,4},
+			{5,1,1,1,1,5},
+			{0,6,0,6,0,6}};
+		GameObject to = Instantiate (generator);
+		Vector3 horientacion = new Vector3 (45, -45, 0);
+		to.GetComponent<MapCreation> ().setMatrix (matrix,6,6,horientacion,0.8f,Color.red);
+	}
+
+	// Update is called once per frame
+	void Update () {
+
+	}
+}
+
diff --git a/Assets/FloorCreator/TestController.cs.meta b/Assets/FloorCreator/TestController.cs.meta
new file mode 100644
index 0000000..f437bf0
--- /dev/null
+++ b/Assets/FloorCreator/TestController.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: b49506e118e61124ab82513ea6128fd2
+timeCreated: 1477882825
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/FloorCreator/TestController.prefab b/Assets/FloorCreator/TestController.prefab
new file mode 100644
index 0000000..0b62a18
--- /dev/null
+++ b/Assets/FloorCreator/TestController.prefab
@@ -0,0 +1,54 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1000012651964030}
+  m_IsPrefabParent: 1
+--- !u!1 &1000012651964030
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 4000012531146598}
+  - 114: {fileID: 114000012175193480}
+  m_Layer: 0
+  m_Name: TestController
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4000012531146598
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1000012651964030}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.17505419, y: 2.914279, z: -5.485957}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+--- !u!114 &114000012175193480
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1000012651964030}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e35c066fc067b904e9dacd1a3a71938d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  generator: {fileID: 1000013182272914, guid: bd3068e9944aae447a20ec5f0a4784be, type: 2}
diff --git a/Assets/FloorCreator/TestController.prefab.meta b/Assets/FloorCreator/TestController.prefab.meta
new file mode 100644
index 0000000..f0b8156
--- /dev/null
+++ b/Assets/FloorCreator/TestController.prefab.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 79c05cc6d6f54ce418b34ec32c6f8a7b
+timeCreated: 1477769605
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/FloorCreator/imported_textures.meta b/Assets/FloorCreator/imported_textures.meta
new file mode 100644
index 0000000..f71456e
--- /dev/null
+++ b/Assets/FloorCreator/imported_textures.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 721f5062276cc0b43a7e022c733dad86
+folderAsset: yes
+timeCreated: 1477809281
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/FloorCreator/imported_textures/Floor1.tga b/Assets/FloorCreator/imported_textures/Floor1.tga
new file mode 100644
index 0000000..8ddb61d
Binary files /dev/null and b/Assets/FloorCreator/imported_textures/Floor1.tga differ
diff --git a/Assets/FloorCreator/imported_textures/Floor1.tga.meta b/Assets/FloorCreator/imported_textures/Floor1.tga.meta
new file mode 100644
index 0000000..8a65676
--- /dev/null
+++ b/Assets/FloorCreator/imported_textures/Floor1.tga.meta
@@ -0,0 +1,59 @@
+fileFormatVersion: 2
+guid: 3377fca7e6042b64f99e0a68b4db477b
+timeCreated: 1477809284
+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: 0.25
+    normalMapFilter: 0
+  isReadable: 1
+  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
+  spriteTessellationDetail: -1
+  textureType: 5
+  buildTargetSettings: []
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/FloorCreator/imported_textures/Floor2.tga b/Assets/FloorCreator/imported_textures/Floor2.tga
new file mode 100644
index 0000000..306ab86
Binary files /dev/null and b/Assets/FloorCreator/imported_textures/Floor2.tga differ
diff --git a/Assets/FloorCreator/imported_textures/Floor2.tga.meta b/Assets/FloorCreator/imported_textures/Floor2.tga.meta
new file mode 100644
index 0000000..954515e
--- /dev/null
+++ b/Assets/FloorCreator/imported_textures/Floor2.tga.meta
@@ -0,0 +1,59 @@
+fileFormatVersion: 2
+guid: 14f79ddfb22057946a2c291df17dd8b8
+timeCreated: 1477809282
+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: 0.25
+    normalMapFilter: 0
+  isReadable: 1
+  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
+  spriteTessellationDetail: -1
+  textureType: 5
+  buildTargetSettings: []
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/FloorCreator/imported_textures/Floor3.tga b/Assets/FloorCreator/imported_textures/Floor3.tga
new file mode 100644
index 0000000..0ed7058
Binary files /dev/null and b/Assets/FloorCreator/imported_textures/Floor3.tga differ
diff --git a/Assets/FloorCreator/imported_textures/Floor3.tga.meta b/Assets/FloorCreator/imported_textures/Floor3.tga.meta
new file mode 100644
index 0000000..452ce4a
--- /dev/null
+++ b/Assets/FloorCreator/imported_textures/Floor3.tga.meta
@@ -0,0 +1,59 @@
+fileFormatVersion: 2
+guid: 31a253788168630499ae578dcb0ed210
+timeCreated: 1477809284
+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: 0.25
+    normalMapFilter: 0
+  isReadable: 1
+  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
+  spriteTessellationDetail: -1
+  textureType: 5
+  buildTargetSettings: []
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/FloorCreator/imported_textures/Floor4.tga b/Assets/FloorCreator/imported_textures/Floor4.tga
new file mode 100644
index 0000000..736e807
Binary files /dev/null and b/Assets/FloorCreator/imported_textures/Floor4.tga differ
diff --git a/Assets/FloorCreator/imported_textures/Floor4.tga.meta b/Assets/FloorCreator/imported_textures/Floor4.tga.meta
new file mode 100644
index 0000000..e78a1fa
--- /dev/null
+++ b/Assets/FloorCreator/imported_textures/Floor4.tga.meta
@@ -0,0 +1,59 @@
+fileFormatVersion: 2
+guid: 82f65049e51ea6941a665212fe066852
+timeCreated: 1477809285
+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: 0.25
+    normalMapFilter: 0
+  isReadable: 1
+  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
+  spriteTessellationDetail: -1
+  textureType: 5
+  buildTargetSettings: []
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/FloorCreator/imported_textures/Floor5.tga b/Assets/FloorCreator/imported_textures/Floor5.tga
new file mode 100644
index 0000000..126cab6
Binary files /dev/null and b/Assets/FloorCreator/imported_textures/Floor5.tga differ
diff --git a/Assets/FloorCreator/imported_textures/Floor5.tga.meta b/Assets/FloorCreator/imported_textures/Floor5.tga.meta
new file mode 100644
index 0000000..8178d4a
--- /dev/null
+++ b/Assets/FloorCreator/imported_textures/Floor5.tga.meta
@@ -0,0 +1,59 @@
+fileFormatVersion: 2
+guid: d75275069863fe6419773a55d238d307
+timeCreated: 1477809287
+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: 0.25
+    normalMapFilter: 0
+  isReadable: 1
+  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
+  spriteTessellationDetail: -1
+  textureType: 5
+  buildTargetSettings: []
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/FloorCreator/imported_textures/Wall1.tga b/Assets/FloorCreator/imported_textures/Wall1.tga
new file mode 100644
index 0000000..47bff14
Binary files /dev/null and b/Assets/FloorCreator/imported_textures/Wall1.tga differ
diff --git a/Assets/FloorCreator/imported_textures/Wall1.tga.meta b/Assets/FloorCreator/imported_textures/Wall1.tga.meta
new file mode 100644
index 0000000..8fd3428
--- /dev/null
+++ b/Assets/FloorCreator/imported_textures/Wall1.tga.meta
@@ -0,0 +1,59 @@
+fileFormatVersion: 2
+guid: 2dc8ddddeadc22f49bb3ea299209af95
+timeCreated: 1477809283
+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: 0.25
+    normalMapFilter: 0
+  isReadable: 1
+  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
+  spriteTessellationDetail: -1
+  textureType: 5
+  buildTargetSettings: []
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/FloorCreator/imported_textures/Wall2.tga b/Assets/FloorCreator/imported_textures/Wall2.tga
new file mode 100644
index 0000000..4906d94
Binary files /dev/null and b/Assets/FloorCreator/imported_textures/Wall2.tga differ
diff --git a/Assets/FloorCreator/imported_textures/Wall2.tga.meta b/Assets/FloorCreator/imported_textures/Wall2.tga.meta
new file mode 100644
index 0000000..c34f335
--- /dev/null
+++ b/Assets/FloorCreator/imported_textures/Wall2.tga.meta
@@ -0,0 +1,59 @@
+fileFormatVersion: 2
+guid: c852064376819694f9e8961d5fc2d92a
+timeCreated: 1477809286
+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: 0.25
+    normalMapFilter: 0
+  isReadable: 1
+  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
+  spriteTessellationDetail: -1
+  textureType: 5
+  buildTargetSettings: []
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/FloorCreator/imported_textures/White.png b/Assets/FloorCreator/imported_textures/White.png
new file mode 100644
index 0000000..f162753
Binary files /dev/null and b/Assets/FloorCreator/imported_textures/White.png differ
diff --git a/Assets/FloorCreator/imported_textures/White.png.meta b/Assets/FloorCreator/imported_textures/White.png.meta
new file mode 100644
index 0000000..f942769
--- /dev/null
+++ b/Assets/FloorCreator/imported_textures/White.png.meta
@@ -0,0 +1,59 @@
+fileFormatVersion: 2
+guid: 0ffd39a2101577945ab854718dbb13ee
+timeCreated: 1477878143
+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: 0.25
+    normalMapFilter: 0
+  isReadable: 1
+  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
+  spriteTessellationDetail: -1
+  textureType: 5
+  buildTargetSettings: []
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/HUD/EndTurn.prefab b/Assets/HUD/EndTurn.prefab
new file mode 100644
index 0000000..65d3e71
--- /dev/null
+++ b/Assets/HUD/EndTurn.prefab
@@ -0,0 +1,81 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1000010060982670}
+  m_IsPrefabParent: 1
+--- !u!1 &1000010060982670
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 224: {fileID: 224000014003918968}
+  - 222: {fileID: 222000012742711570}
+  - 114: {fileID: 114000011079871108}
+  m_Layer: 5
+  m_Name: EndTurn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &114000011079871108
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1000010060982670}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 21300000, guid: 4c980979b287e484bbb87ec90f62aa15, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!222 &222000012742711570
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1000010060982670}
+--- !u!224 &224000014003918968
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1000010060982670}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
diff --git a/Assets/HUD/EndTurn.prefab.meta b/Assets/HUD/EndTurn.prefab.meta
new file mode 100644
index 0000000..70ad071
--- /dev/null
+++ b/Assets/HUD/EndTurn.prefab.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4a32714e9b9dfa849a80b07d9381af33
+timeCreated: 1477845153
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/HUD/XCOM2_EndTurn.png b/Assets/HUD/XCOM2_EndTurn.png
new file mode 100644
index 0000000..9895c35
Binary files /dev/null and b/Assets/HUD/XCOM2_EndTurn.png differ
diff --git a/Assets/HUD/XCOM2_EndTurn.png.meta b/Assets/HUD/XCOM2_EndTurn.png.meta
new file mode 100644
index 0000000..39e2192
--- /dev/null
+++ b/Assets/HUD/XCOM2_EndTurn.png.meta
@@ -0,0 +1,59 @@
+fileFormatVersion: 2
+guid: 4c980979b287e484bbb87ec90f62aa15
+timeCreated: 1477844465
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    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: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  allowsAlphaSplitting: 0
+  spriteMode: 1
+  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: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/InputManager.prefab b/Assets/InputManager.prefab
index fa2edae..3202d16 100644
--- a/Assets/InputManager.prefab
+++ b/Assets/InputManager.prefab
@@ -51,7 +51,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e30eb79cd423fd04691b1402c8e578ef, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  image_move: {fileID: 114000013716489878, guid: d80ae4a7a1bea5d48b549fbf1ef3f3f5,
+  imageMove: {fileID: 114000013716489878, guid: d80ae4a7a1bea5d48b549fbf1ef3f3f5,
     type: 2}
-  image_attack: {fileID: 114000012902201940, guid: 8b74ce38e76531b42a1b0af65416b73a,
+  imageAttack: {fileID: 114000012902201940, guid: 8b74ce38e76531b42a1b0af65416b73a,
+    type: 2}
+  imageEndTurn: {fileID: 114000011079871108, guid: 4a32714e9b9dfa849a80b07d9381af33,
     type: 2}
diff --git a/Assets/UnitBehaviour.cs b/Assets/UnitBehaviour.cs
index b678cc7..bdd26fb 100644
--- a/Assets/UnitBehaviour.cs
+++ b/Assets/UnitBehaviour.cs
@@ -142,9 +142,9 @@ public class UnitBehaviour : MonoBehaviour {
 	
 	// Update is called once per frame
 	void Update () {
-		if(Input.GetKeyDown("1")) {
+		/*if(Input.GetKeyDown("1")) {
 			attackAct ();
-		}
+		}*/
 
 		if (damageAnim) {
 			anim.Play ("hit", -1, 0f);
diff --git a/Assets/scene1.unity b/Assets/scene1.unity
index b818468..80f7260 100644
--- a/Assets/scene1.unity
+++ b/Assets/scene1.unity
@@ -282,6 +282,10 @@ Prefab:
       propertyPath: m_RootOrder
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 1000012424904804, guid: 33cc7f9d6a91e7e47b47009a309bd894, type: 2}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 33cc7f9d6a91e7e47b47009a309bd894, type: 2}
   m_IsPrefabParent: 0