data collect
data collect
Merge branch 'temp1'

Conflicts:
	crawler.rb
	db_backup_20140104-223459.sql
	db_backup_20140105-100111.sql
	log/result4.log