commit duoyu
Merge branch 'master' of https://github.com/Thinkinglife2013/Bottle_llk