1
item
Merge branch 'master' of github.com:jinshikuo/jl-workdir

Conflicts:
	myspider/myspider/items.py
	myspider/myspider/spiders/weibo_spider.py