update
Merge remote-tracking branch 'origin/master'

Conflicts:
	douban/mydouban.py
test1
Merge branch 'master' of https://github.com/pkhopper/scripts