Merge master into branch-yangda

src/main/java/seedu/budgetBuddy/Expense.java

@@ -1,4 +1,4 @@
-package seedu.budgetbuddy.task;
+package seedu.budgetbuddy;
 
 public class Expense extends Transaction{
     protected String description;

src/main/java/seedu/budgetBuddy/ExpenseList.java

@@ -1,10 +1,8 @@
-package seedu.budgetbuddy.data;
+package seedu.budgetbuddy;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import seedu.budgetbuddy.task.Expense;
-
 public class ExpenseList {
     protected ArrayList <Expense> expenses;
     protected ArrayList<String> categories;

src/main/java/seedu/budgetBuddy/Saving.java

@@ -1,4 +1,4 @@
-package seedu.budgetbuddy.task;
+package seedu.budgetbuddy;
 
 public class Saving extends Transaction{
 

src/main/java/seedu/budgetBuddy/SavingList.java

@@ -1,10 +1,8 @@
-package seedu.budgetbuddy.data;
+package seedu.budgetbuddy;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import seedu.budgetbuddy.task.Saving;
-
 public class SavingList {
     protected ArrayList <Saving> savings;
     protected ArrayList<String> categories;

src/main/java/seedu/budgetBuddy/TaskManager.java

@@ -1,9 +1,5 @@
 package seedu.budgetbuddy;
 
-import seedu.budgetbuddy.data.ExpenseList;
-import seedu.budgetbuddy.data.SavingList;
-
-
 public class TaskManager {
     private static ExpenseList expenses = new ExpenseList();
     private static SavingList savings = new SavingList();

src/main/java/seedu/budgetBuddy/Transaction.java

@@ -1,4 +1,4 @@
-package seedu.budgetbuddy.task;
+package seedu.budgetbuddy;
 
 public abstract class Transaction {
     String category;