/**
 * 
 */
package main;

<<<<<<< Updated upstream
/**
 * @author Bart
 *
 */
public class MainClass {

	/**
	 * @param arg - the main arguments
	 */
	public static void main(String[] args) {
		
		System.out.println("Welcom to the main class of goto-fail;");

	}

=======
import lombok.Getter;
import lombok.Setter;

public class MainClass {
    @Getter
    @Setter
    public static int counter;

    /**
     * @param args - the main arguments.
     */
    public static void main(String[] args) {
        setCounter(5);
        System.out.println(getCounter());
    System.out.println("Welcome to the main class of goto-fail;");
    }
>>>>>>> Stashed changes
}

@@ -1,16 +1,4 @@
-/**%0A * %0A */%0A
 pack
@@ -12,254 +12,8 @@
 n;%0A%0A
-%3C%3C%3C%3C%3C%3C%3C Updated upstream%0A/**%0A * @author Bart%0A *%0A */%0Apublic class MainClass %7B%0A%0A%09/**%0A%09 * @param arg - the main arguments%0A%09 */%0A%09public static void main(String%5B%5D args) %7B%0A%09%09%0A%09%09System.out.println(%22Welcom to the main class of goto-fail;%22);%0A%0A%09%7D%0A%0A=======%0A
 impo
@@ -89,20 +89,16 @@
  @Getter
-%0A   
  @Setter
@@ -297,16 +297,20 @@
 ter());%0A
+    
     Syst
@@ -378,30 +378,6 @@
   %7D%0A
-%3E%3E%3E%3E%3E%3E%3E Stashed changes%0A
 %7D%0A

Remove wierd git behaviour & Fix name javadoc