First commit of pelican blog
Merge branch 'master' into pelican