update octopress/README
fix merge conflict