Merge remote-tracking branch 'Jason/Jason' into Jason

# Conflicts:
#	src/HiGit.java

src/HiGit.java

@@ -1,15 +1,11 @@
 public class HiGit {
     public static void main(String[] args) {
-<<<<<<<<< Temporary merge branch 1
         System.out.println("111111");
         System.out.println("111111");
         System.out.println("111111");
         System.out.println("111111");
-=========
         System.out.println("HiGit");
       System.out.println("HiGit");
       System.out.println("HiGit");
-     
->>>>>>>>> Temporary merge branch 2
     }
 }