Index: client/Client/Client.vcxproj.filters
===================================================================
--- client/Client/Client.vcxproj.filters	(revision 62ee2ceb8ecee33c00a41267ea1c22a94758a04d)
+++ client/Client/Client.vcxproj.filters	(revision f401cacfe731f6b2250ae24b93ae312007933918)
@@ -56,5 +56,5 @@
     </ClCompile>
     <ClCompile Include="..\..\common\WorldMap.cpp">
-      <Filter>Source Files\gui</Filter>
+      <Filter>Source Files\common</Filter>
     </ClCompile>
   </ItemGroup>
Index: client/Client/main.cpp
===================================================================
--- client/Client/main.cpp	(revision 62ee2ceb8ecee33c00a41267ea1c22a94758a04d)
+++ client/Client/main.cpp	(revision f401cacfe731f6b2250ae24b93ae312007933918)
@@ -29,6 +29,6 @@
 #include "../../common/Message.h"
 #include "../../common/Common.h"
+#include "../../common/WorldMap.h"
 #include "../../common/Player.h"
-#include "../../common/WorldMap.h"
 
 #include "Window.h"
@@ -160,5 +160,7 @@
    }
 
-   WorldMap* gameMap = WorldMap::createDefaultMap();
+   WorldMap* gameMap = WorldMap::loadMapFromFile("../../data/map.txt");
+   //delete gameMap;
+   //gameMap = WorldMap::createDefaultMap();
 
    wndLogin = new Window(0, 0, SCREEN_W, SCREEN_H);