diff --git a/Saved/Config/Windows/EditorLayout.ini b/Saved/Config/Windows/EditorLayout.ini
diff --git a/Saved/Config/Windows/EditorUserSettings.ini b/Saved/Config/Windows/EditorUserSettings.ini
@@ -46,14 +46,12 @@ CleanShutdown=False
 
 [ModuleFileTracking]
 UnrealRPG.TimeStamp=2015.03.10-00.53.47
-<<<<<<< HEAD
 UnrealRPG.TimeStamp=2015.03.10-21.59.52
-=======
 UnrealRPG.TimeStamp=2015.03.10-20.07.42
-UnrealRPG.TimeStamp=2015.03.10-23.17.13
+UnrealRPG.TimeStamp=2015.03.10-23.53.38
+None=======
 None=======
 None=======
->>>>>>> a41b03686bbec131f4ec9b6ec4cefce0f96ee438
 UnrealRPG.LastCompileMethod=Runtime
 UnrealRPG.LastCompileMethod=External
 PakFile.TimeStamp=2015.03.05-03.57.53
@@ -431,20 +429,16 @@ WindowSize=X=1350.000 Y=790.000
 WindowSize=X=1440.000 Y=880.000
 WindowSize=X=1450.000 Y=826.000
 WindowSize=X=1440.000 Y=826.000
-<<<<<<< HEAD
 WindowSize=X=1490.000 Y=826.000
-=======
 WindowSize=X=1490.000 Y=846.000
-<<<<<<< HEAD
 WindowSize=X=1480.000 Y=836.000
-=======
 WindowSize=X=1490.000 Y=846.000
 None=======
 None=======
->>>>>>> master
 None=======
 None=======
->>>>>>> a41b03686bbec131f4ec9b6ec4cefce0f96ee438
+None=======
+None=======
 None=======
 None=======
 None=======
@@ -492,12 +486,10 @@ AssetPropertyPicker.CurrentViewType=0
 [Directories2]
 UNR=../../../../../../Users/NA-BLIU/Documents/Unreal Projects/UnrealRPG/Content/World
 UNR=../../../../../../Documents/Unreal Projects/UnrealRPG/Content/World
-<<<<<<< HEAD
 UNR=../../../../../../Users/Michael/Documents/Unreal Projects/UnrealRPG/Content/World
-=======
 UNR=../../../../../../Documents/Unreal Projects/UnrealRPG/Content/World
 None=======
->>>>>>> master
+None=======
 None=======
 None=======
 BRUSH=../../../../../../Documents/Unreal Projects/UnrealRPG/Content/
@@ -514,17 +506,15 @@ Project=D:/Program Files/Epic Games/4.7/
 
 [MRU]
 MRUItem0=D:/Documents/Unreal Projects/UnrealRPG/Content/World/NewMap.umap
-<<<<<<< HEAD
 MRUItem0=C:/Users/Michael/Documents/Unreal Projects/UnrealRPG/Content/World/NewMap.umap
 MRUItem1=C:/Users/NA-BLIU/Documents/Unreal Projects/UnrealRPG/Content/World/NewMap.umap
 MRUItem1=C:/Users/NA-BLIU/Documents/Unreal Projects/UnrealRPG/Content/World/NewMap.umap
+MRUItem1=C:/Users/Michael/Documents/Unreal Projects/UnrealRPG/Content/World/NewMap.umap
 MRUItem2=C:/Users/Michael/Documents/Unreal Projects/UnrealRPG/Content/World/NewMap.umap
 MRUItem2=D:/Documents/Unreal Projects/UnrealRPG/Content/World/NewMap.umap
-None=======
-=======
-MRUItem1=C:/Users/Michael/Documents/Unreal Projects/UnrealRPG/Content/World/NewMap.umap
 MRUItem2=C:/Users/NA-BLIU/Documents/Unreal Projects/UnrealRPG/Content/World/NewMap.umap
->>>>>>> master
+None=======
+None=======
 MRUItem3=D:/Documents/Unreal Projects/UnrealRPG/Content/NewMap.umap
 MRUItem4=D:/Documents/Unreal Projects/UnrealRPG/Content/World/World_Main.umap
 
@@ -551,16 +541,14 @@ RecentlyPlaced=/Game/StarterContent/Architecture/Floor_400x400.Floor_400x400;
 RecentlyPlaced=/Game/StarterContent/Textures/T_CobbleStone_Pebble_D.T_CobbleStone_Pebble_D;
 RecentlyPlaced=/Game/StarterContent/Textures/T_CobbleStone_Rough_D.T_CobbleStone_Rough_D;
 RecentlyPlaced=/Game/StarterContent/Materials/M_Metal_Steel.M_Metal_Steel;
-<<<<<<< HEAD
 RecentlyPlaced=/Game/StarterContent/Materials/M_Ground_Grass.M_Ground_Grass;
 RecentlyPlaced=/Game/StarterContent/Architecture/Wall_Window_400x400.Wall_Window_400x400;
 RecentlyPlaced=/Game/StarterContent/Architecture/Wall_Door_400x300.Wall_Door_400x300;
 RecentlyPlaced=/Game/Character/BP_Character.BP_Character;
 RecentlyPlaced=/Game/Character/asd.asd;
 RecentlyPlaced=/Game/Gold/GP.GP;
-=======
 None=======
->>>>>>> a41b03686bbec131f4ec9b6ec4cefce0f96ee438
+None=======
 
 [DetailCategories]
 Emitter.TransformCommon=True
@@ -1321,8 +1309,8 @@ Primitive=False
 User Created=True
 
 [DetailPropertyExpansion]
-InputSettings="Object.Bindings.ActionMappings.ActionMappings[1]" 
-Object="Object.Bindings.ActionMappings.ActionMappings[1]" 
+InputSettings=Object.Bindings.ActionMappings.ActionMappings[1]
+Object=Object.Bindings.ActionMappings.ActionMappings[1]
 Image=
 Widget=Object.Style.WidgetStyle" "Object.Appearance.ColorAndOpacity
 Visual=Object.Style.WidgetStyle" "Object.Appearance.ColorAndOpacity
@@ -1337,10 +1325,10 @@ None=======
 None=======
 TextBlock=Object.Appearance.ColorAndOpacity
 TextBlock=Object.Appearance.ColorAndOpacity
-Brush="Object.BrushBuilder.BrushBuilder.Object.BrushSettings" 
-LightmassImportanceVolume="Object.BrushBuilder.BrushBuilder.Object.BrushSettings" 
-Volume="Object.BrushBuilder.BrushBuilder.Object.BrushSettings" 
-PostProcessVolume="Object.PostProcessVolume" "Object.BrushBuilder.BrushBuilder.Object.BrushSettings" 
+Brush=Object.BrushBuilder.BrushBuilder.Object.BrushSettings
+LightmassImportanceVolume=Object.BrushBuilder.BrushBuilder.Object.BrushSettings
+Volume=Object.BrushBuilder.BrushBuilder.Object.BrushSettings
+PostProcessVolume=Object.PostProcessVolume" "Object.BrushBuilder.BrushBuilder.Object.BrushSettings
 ProgressBar=Object.Style.WidgetStyle" "Object.Style.WidgetStyle.FillImage
 Button=Object.Style.WidgetStyle" "Object.Appearance.ColorAndOpacity
 ContentWidget=Object.Style.WidgetStyle" "Object.Appearance.ColorAndOpacity