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

src/sort/Range.java

@@ -37,11 +37,15 @@ public class Range<Key extends Comparable<Key>> {
 		this.boundType = bt;
 	}
 	
+<<<<<<< HEAD
+	public <T> boolean inBounds(T key) {
+=======
 <<<<<<< HEAD
 	public <T> boolean inBounds(T key) {
 =======
 	public boolean inBounds(Key key, GeneralCompare<Key> gc) {
 >>>>>>> fd3aa70... add Bound and Range
+>>>>>>> refs/remotes/origin/master
 		if (boundType == Bound.ANY) return true;
 		else if (boundType == Bound.LOWER) 	return gc.compare(lower, key) <= 0;
 		else if (boundType == Bound.UPPER) 	return gc.compare(upper, key) >= 0;