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