second change
Merge branch 'master' of https://github.com/Soloyuan/Stock.git