Merge pull request #1 from liu21st/master

Merge branch 'master' of github.com:liu21st/thinkphp