initialise octopress blog
Initial commit
Merge branch 'source'
try to publish a new post
merge conflicts