this is an old version. The annotationManager is old. I did not commit, however I modified the version in lab. So it conflicts.
However the RegularExpressionTest is new. It's written at home.
Merge remote-tracking branch 'origin/master'

Conflicts:
	comviz/src/comonviz/AnnotationManager.java

 Changes to be committed:
	new file:   ../../jar/COMON_v7.owl
	new file:   ../../jar/comonviz.jar
	modified:   ../../resources/COMON_v7.owl
	modified:   ../../resources/catalog-v001.xml
	modified:   ../ca/uvic/cs/chisel/cajun/graph/node/DefaultGraphNode.java
	modified:   ../ca/uvic/cs/chisel/cajun/util/CustomToolTipManager.java
	modified:   AnnotationManager.java
	modified:   StyleManager.java
	new file:   ../test/StringSort.java

 Untracked files:
   (use "git add <file>..." to include in what will be committed)

	../.gitignore
** this is my first merge commit! :)

:wq
: