Intermingled github-edit/local-edit instructions in exercise for "Collaborating within the same repository"

The steps of the exercise are not always clear on where the step is performed or if it is needed for github-based edits versus local repository edits.

Particularly step 5.