Merge branch 'master' of https://github.com/unklyf/Stock.git