Merge branch 'master' into 'frontend-testing'

# Conflicts:
#   src/main/java/no/ntnu/idatt1002/demo/controller/AddBudgetController.java
#   src/main/java/no/ntnu/idatt1002/demo/controller/AddExpenseController.java
#   src/main/java/no/ntnu/idatt1002/demo/controller/AddIncomeController.java
#   src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java
#   src/main/java/no/ntnu/idatt1002/demo/controller/FinanceController.java
#   src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java
#   src/main/java/no/ntnu/idatt1002/demo/controller/MainMenu.java
#   src/main/java/no/ntnu/idatt1002/demo/controller/SceneController.java
#   src/main/resources/Economics/Income.register
#   src/main/resources/view/IncomeAndExpenses.fxml

src/main/java/no/ntnu/idatt1002/demo/controller/AddBudgetController.java

@@ -41,6 +41,10 @@ public class AddBudgetController {
     @FXML
     private Button cancelBtn;
 
+    /**
+     * Initializes the category drop box by filling it with all the values from the ExpenseCategory enum.
+     * It then sets a prompt text on the box.
+     */
     @FXML
     private Text errorMsg;
 

src/main/resources/Economics/Income.register

-date=2023-04-10
-amount=499.0
+date=2023-03-25
+amount=100.0
 isRecurring=Not recurring
 category=GIFT
 
-date=2023-04-10
-amount=200.0
+date=2023-03-31
+amount=500.0
 isRecurring=Not recurring
 category=SALARY