web

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

web

Conflicts:
	tomcat/webapps/Trawl/histogram.jsp

web

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Temporary changes

web

# Conflicts:
#	src/search/Histogram.java
#	src/sort/Bound.java

scientific name

model. added new BasicSearchResult object which encapsulates all data
and functions to do with a basic search result (results, time, sum,
histogram, etc)

Merge Red-Black Tree, Quickselect and WIP graph into master

See merge request schankuc/2XB3!10

Resolved Conflicts:
	.gitignore
	src/sandbox/Point.java
	src/sort/Bound.java
	src/sort/GeneralCompare.java
	src/sort/KDT.java
	src/sort/MergeSort.java
	src/sort/Range.java