Fixed merge errors

src/sort/Bound.java

-<<<<<<< HEAD
+
 package sort;
 /**
  * Enumeration of bound types.
  * @author Christopher W. Schankula
  *
  */
-=======
-package sort;
-
->>>>>>> b093c71758057e7a5b83b69a7632a229ad1469bf
+
+
 public enum Bound {
 	LOWER, UPPER, LOWHIGH, ANY, EQUALS;
 }