add a file on mybranch
Merge pull request #1 from lingshaowei/mybranch

merge master/mybrach: add a file on mybranch