update
Merge branch 'gh-pages' of https://github.com/sforg/blog.git into gh-pages