first local commit with pelican dada-blog
merging from init commit upstream
Merge branch 'master' of dada-blog

merging local with remote