Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/gittest/Main.java

src/gittest/Main.java

@@ -3,5 +3,7 @@ package gittest;
 public class Main {
     public static void main(String[] args) {
         C c = new C(); // Test
+        A a = new A();
+        B b = new B();
     }
 }