Merge branch 'master' of https://github.com/lanryZhang/MyFramework
Merge branch 'master' of https://github.com/lanryZhang/MyFramework
Merge pull request #2 from lanryZhang/master

merge