Merge branch 'master' of https://github.com/hesq/spider.git
Merge branch 'master' of https://github.com/hesq/spider.git

Conflicts:
	src/com/dot/Test.java