Fixed a bug.
Merge branch 'master' of https://github.com/hczhu/script-tools

Conflicts:
	stock.py