diff --git a/Minuit/Saved/Config/Windows/EditorLayout.ini b/Minuit/Saved/Config/Windows/EditorLayout.ini
diff --git a/Minuit/Saved/Config/Windows/EditorUserSettings.ini b/Minuit/Saved/Config/Windows/EditorUserSettings.ini
@@ -62,13 +62,11 @@ OnlyBuildVisibility=False
 CleanShutdown=True
 
 [RootWindow]
-<<<<<<< HEAD
 ScreenPosition=X=128.000 Y=52.000
-WindowSize=X=1400.000 Y=840.000
-=======
 ScreenPosition=X=271.000 Y=58.000
-WindowSize=X=1510.000 Y=864.000
->>>>>>> 3eed2e1cc3292434bc5da3712a6883ea42f4ba11
+WindowSize=X=1400.000 Y=840.000
+WindowSize=X=1520.000 Y=874.000
+None=======
 InitiallyMaximized=True
 
 [SlateAdditionalLayoutConfig]

diff --git a/Minuit/Saved/Config/Windows/Engine.ini b/Minuit/Saved/Config/Windows/Engine.ini
@@ -1,6 +1,6 @@
 [Core.System]
 Paths=../../../Engine/Content
-Paths=../../../../../../Users/User/Documents/MinuitGame/Minuit/Content
+Paths=../../../../../../documents/3d/minuit/MinuitGame/Minuit/Content
 Paths=../../../Engine/Plugins/2D/Paper2D/Content
 Paths=../../../Engine/Plugins/Experimental/CharacterAI/Content
 

diff --git a/Minuit/Saved/Logs/Minuit-backup-2015.09.09-18.13.41.log b/Minuit/Saved/Logs/Minuit-backup-2015.09.09-18.13.41.log
diff --git a/Minuit/Saved/Logs/Minuit-backup-2015.09.11-15.43.19.log b/Minuit/Saved/Logs/Minuit-backup-2015.09.11-15.43.19.log
diff --git a/Minuit/Saved/Logs/Minuit-backup-2015.09.14-17.48.22.log b/Minuit/Saved/Logs/Minuit-backup-2015.09.14-17.48.22.log
diff --git a/Minuit/Saved/Logs/Minuit-backup-2015.09.14-19.52.09.log b/Minuit/Saved/Logs/Minuit-backup-2015.09.14-19.52.09.log
diff --git a/Minuit/Saved/Logs/Minuit-backup-2015.09.15-14.44.13.log b/Minuit/Saved/Logs/Minuit-backup-2015.09.15-14.44.13.log
diff --git a/Minuit/Saved/Logs/Minuit-backup-2015.09.22-15.41.42.log b/Minuit/Saved/Logs/Minuit-backup-2015.09.22-15.41.42.log
diff --git a/Minuit/Saved/Logs/Minuit.log b/Minuit/Saved/Logs/Minuit.log