Resolve merge conflict

Client/Save/save.js

@@ -20,9 +20,4 @@ function saveData() {
 
 function cancelData() {
     mp.trigger("cancelData");   
-}
-
-function getType() {
-    mp.gui.chat.push("getType");
-    return typ;
 }

Client/index.js

@@ -7,13 +7,10 @@
 
 require('./Login/main.js');
 require('./Save/main.js');
-require('./Save/save.js');
 require('./Gui/deathscreen.js');
 require('./Gui/infobox.js');
 require('./Gui/playerlist.js');
-require('./Login/main.js');
 require('./Player/keys.js');
-require('./Save/main.js');
-
+require('./Player/waypoint.js');
 require('./FactionManagement/main.js');