User sees change log to this blog
Merge branch 'master' of github.com:zlu/octopress
merging...