Testing a commit from another user.
Editing a test file
Merge branch 'master' into test