Merge branch 'master' into lsl

# Conflicts:
#	src/gitTest/Test.java

src/gitTest/Test.java

@@ -22,4 +22,27 @@ public class Test {
     
 
     
+    public static void  Test_rebase2(){
+    	System.out.println("Test_rebase2");
+    }
+    
+    public static void  Test_reset1(){
+    	System.out.println("Test_reset1");
+    }
+    
+    public static void  Test_reset2(){
+    	System.out.println("Test_reset2");
+    }
+    
+    public static void  Test_revert(){
+    	System.out.println("Test_revert");
+    }
+    
+    
+    public static void  Test_stage2(){
+    	System.out.println("Test_stage2");
+    }
+    public static void  Test_Conflict12(){
+    	System.out.println("Test_Conflict12");
+    }
 }