Merge branch 'second-line' into new-intro-branch

Conflicts:
first_file