Merge branch 'dev' of https://git.attractor-school.com/aj-9/25 into dev_kair2

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,9 +3,14 @@ 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("...");
     }
 
     public void MyTruck() {

Program.java

@@ -5,5 +5,9 @@ public class Program {
         //This is my new dev branch
         ////
         //коммент от Айбека
+        //Ок ок ок
+
+
+        System.out.println("Работа с тикетами )");
     }
 }
\ No newline at end of file