Merge remote-tracking branch 'origin/master' into try

Conflicts:
	DesignV2/src/DesignV2/Hello.java

DesignV2/src/DesignV2/Hello.java

@@ -4,7 +4,11 @@ public class Hello {
      * @param args command-line arguments; currently unused
      */
 	public void dog () {}
+
 	public void zebra () {}
+
+	public void lion() {}
+
     public static void main ( String [] args ) {
 
         System . out . println (" Hello , world !" );