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