Merge remote-tracking branch 'origin/main'

Author: parmism

src/main/java/entities/user_entities/BasicUser.java

@@ -1,7 +1,7 @@
 package entities.user_entities;
 
 import java.util.ArrayList;
-import entities.chat;
+import entities.chat.Chat;
 
 public class BasicUser extends User{
     public BasicUser(String Username, String Password, String Email, ArrayList<Chat> userChats){

src/main/java/interface_adapters/app_screen_interface_adapters/AppScreenLoader.java

@@ -1,7 +1,7 @@
 package interface_adapters.app_screen_interface_adapters;
 
+import entities.chat.Chat;
 import use_cases.app_screen_use_case.AppScreenPresenter;
-import entities.*;
 import screens.app_screen.AppScreen;
 
 import java.util.ArrayList;