Inklings: a tumblelog

Developer branches and cross-branch merging