There shall be a blog!
Merge branch 'master' of github.com:diaspora/diaspora-project-site