master - 2 konflikt przy pr

src/Main.java

@@ -4,6 +4,7 @@ public class Main {
 
 
 /* TODO OP: Test bez nadrzędnego rodzica
+
    @type: Wydanie
    @assignee: andy@andyhurricane.pl
    @priority: High
@@ -32,7 +33,8 @@ public static void main(String[] args) {
         // to see how IntelliJ IDEA suggests fixing it.
         System.out.printf("Hello and welcome!");
 
-        new Test().test();
+        Test x = new Test();
+        x.test();
         for (int i = 1; i <= 5; i++) {
             //TIP Press <shortcut actionId="Debug"/> to start debugging your code. We have set one <icon src="AllIcons.Debugger.Db_set_breakpoint"/> breakpoint
             // for you, but you can always add more by pressing <shortcut actionId="ToggleLineBreakpoint"/>.

src/test.html

@@ -0,0 +1 @@
+asd