added config file
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	crawler/http-cache/CURRENT
	crawler/http-cache/LOG
	crawler/http-cache/LOG.old
added config file
Merge remote-tracking branch 'origin/master'