/trunk
Begin committing "merge/extend blocks". See #8.
This commit adds the first merge page to the UI.