mod
mod
Merge branch 'master' of ssh://git@github.com/ganboing/COMP4321.git

Conflicts:
	bin/GlobalPageTable.class
	bin/HttpWorkerTask.class
	bin/IntermediatePageDescriptor.class
	bin/InvertedIdx.class
	bin/JavaDontHaveGlobalVar.class
	bin/LinkExtractor.class
	bin/NewString.class
	bin/PageTermDescriptor.class
	bin/Porter.class
	bin/Post.class
	bin/Posting.class
	bin/PtrCache.class
	bin/SearchHelper.class
	bin/StopStem.class
	bin/StringExtractor.class
	bin/SyncTermObj.class
	bin/TermTree.class
	bin/TestHttpConnection.class
	bin/TestJDBM.class
	bin/TestThreadPool.class
	bin/TheSoCalledMonitor.class
	bin/WebPageDescriptor$TermDescriptor.class
	bin/WebPageDescriptor.class
	bin/WorkerThread.class
	bin/lab1.class
	bin/parser.class
Merge branch 'master' of ssh://git@github.com/ganboing/COMP4321.git