copy edits
changed mdash
resolve merge conflict
Merge pull request #684 from optimizely/soliver/copy-edits

copy edits