Note to commit in instructions
Merge branch 'trainee_answers' into author_answers