add merge code
Merge branch 'master' of https://github.com/zluo/stock.lab