Merge branch 'master' of https://github.com/yeyunan/hello into bug_1
Merge branch 'bug_1' of https://github.com/yeyunan/hello into bug_1