blog update
Merge branch 'gh-pages' of github.com:jshum/blog into gh-pages