adffadf
Merge branch 'master' of https://github.com/xieke/crawler

Conflicts:
	log/cachelog