updated with gabriel's notes
Merge branch 'master' of github.com:flyingmachine/nanoc-blog