Merge branch-Level-6 and fix merge conflicts

Author: BenjoBurger

src/main/java/burger/Burger.java

@@ -1,19 +1,17 @@
 package burger;
 
-import java.io.IOException;
 import java.util.Scanner;
 
 import burger.list.List;
 
-import static burger.BurgerFileClass.*;
-
-public class Burger {
+public class
+{
     static final String CHATBOT_NAME = "Burger";
     static final String HORIZONTAL_LINE = "---------------------------------";
 
-    public static void main(String[] args) throws IOException {
+    public static void main(String[] args) {
         welcomeMessage();
-        List myList = getSaveFile();
+        List myList = new List();
         Scanner input = new Scanner(System.in);
         boolean isPolling = true;
         while (isPolling) {
@@ -34,7 +32,7 @@ public static void main(String[] args) throws IOException {
                 }
             }
         }
-        goodbye(myList);
+        goodbye();
     }
 
     private static void welcomeMessage() {
@@ -57,9 +55,7 @@ private static void printUnknownInputError() {
         printLine();
     }
 
-    public static void goodbye(List currList) throws IOException {
-        System.out.print("Saving file");
-        setSaveFile(PATHNAME, currList);
+    public static void goodbye() {
         printLine();
         System.out.println("Bye. Hope to see you again soon!");
         printLine();

src/main/java/burger/BurgerFileClass.java

@@ -32,7 +32,7 @@ public List() {
      */
     public boolean isValidCommand(String[] textArray) {
         boolean isValid = true;
-        int idx = 0;
+        int idx;
         try {
             String command = textArray[COMMANDIDX];
             switch (command) {
@@ -66,14 +66,6 @@ public boolean isValidCommand(String[] textArray) {
         }
     }
 
-    public void addFromSaveFile(char tde, char mark, String task) {
-        Task currTask = new Task(task, tde);
-        if (mark == 'X') {
-            currTask.markDone();
-        }
-        taskList.add(currTask);
-    }
-
     private static int getIdx(String[] textArray) {
         StringBuilder idx = new StringBuilder();
         for (int i = 1; i < textArray.length; i++) {