setting
Merge branch 'master' of github.com:shaoweizhang/mysite