Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/gittest/Main.java

src/gittest/B.java

@@ -2,6 +2,15 @@ package gittest;
 
 public class B {
 
+    /**
+     * Test method
+     * @param args
+     */
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
+
+    }
+
     @Override
     public String toString() {
         return "This is a string from B (would usually do something else)";