Merge remote-tracking branch 'origin/dev' into dev

Model/Hello.java

+package Model;
+
+public class Hello {
+    public static void main(String[] args) {
+        //By zhenya
+        System.out.println("Hello, world!");
+    }
+}

Model/Truck.java

@@ -3,8 +3,13 @@ package Model;
 public class Truck {
     // Comment
     public Truck() {
-     //Dev Kair  
-     //20/11/2024
-     //1111111
+     //Dev Kair
+
+
+
+
+
+     // Some change with-out merge conflict
+        System.out.println("...");
     }
 }