新加博文
Merge branch 'master' of github.com:hyacz/hyacz.github.com