update
Merge branch 'master' of github.com:huaoguo/huaoguo.github.com