Merge branch 'master' into jack-version

.gitignore

@@ -15,3 +15,7 @@ Thumbs.db
 
 ####QRCODE png
 WOB/qr_code.png
+
+
+###Ignore save as text directory
+trajAsText/**
\ No newline at end of file

Traj/server.js

@@ -919,7 +919,7 @@ if(root_path =="."){
 }
 
 //Create the path to the traj directory for saving trajs
-var traj_path = pathModule.normalize(root_path + "/traj");
+var traj_path = pathModule.normalize(root_path + "/trajAsText");
 //console.log("Traj path: " + traj_path);
 
 //TODO: check for paths here