complete intro
Merge branch 'intro'