update
update spider
Merge branch 'me'

Conflicts:
	spider.go
restore gitdb.go
Merge branch 'me'
update