hopefully? fix merge conflicts from TeamB branch

Proposals/Chris/.DS_Store

Proposals/Chris/designSpec.hst

Proposals/Chris/designSpec.pdf

Proposals/Chris/designSpec.tex

Proposals/Chris/designSpec.ver

src/graph/CC.java

src/search/CCTest.java

src/search/DepthFirstSearch.java

src/search/GeneralCompare.java

src/search/RBNode.java

src/search/RedBlackTree.java

src/search/RedBlackTreeTest.java

src/sort/MergeSort.java

src/sort/MergeSortTest.java

src/sort/QuickSelect.java

src/sort/QuickSelectTest.java

src/sort/Range.java