first
secend
add dllive
Delete config.ini
update
update
update
Merge remote-tracking branch 'origin/master'

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