my demo

my demo
Merge branch 'master' of https://github.com/guohao/mydemo.git