- Moved notes around

- CSS Changes
- DOM

- Added ignore for tomcat/work/Catalina/localhost/Trawl/org/apache

- Adapted to new way of sending data between java and the site

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