adding all
Merge branch 'master' of github.com:phutchins/octopress