Merge remote-tracking branch 'origin/master'

src/Data.java

@@ -188,9 +188,9 @@ public class Data {
 
             String date = parts[0];
             String user = parts[1];
-            String mealtyp = parts[3];
-            String deserttyp = parts[5];
-            orderList.add(new Order(date, user, mealtyp, deserttyp));
+            String mealtype = parts[3];
+            String deserttype = parts[5];
+            orderList.add(new Order(date, user, mealtype, deserttype));
         }
         return null;//orderList
 
@@ -207,6 +207,8 @@ public class Data {
 
         } else if (pathWrite.equals("orders.txt")) {
 
+        } else if (pathWrite.equals("menue.txt")){
+
         }
     }