Merge branch 'test' into dev

Conflicts:
	src/main/java/Main.java

src/main/java/Main.java

@@ -1,14 +1,15 @@
public class Main {
    public static void main(String[] args)throws Exception{
        System.out.println(66633);
    }
    
    
    public static void mai3n(String[] args)throws Exception{
        System.out.println(555333333);
    }
    public static void maind(String[] args)throws Exception{
        System.out.println(333333333);
    }
}