a
Merge branch 'master' of https://github.com/theshadowfog/blog.rb