rewritten intro
Merge branch 'rewrite-of-intro'