updated
Merge branch 'master' of ssh://github.com/hansliu/hansliu-pelican-blog
updated