Making a change
 Merge message. Merge branch 'master' of https://github.com/aaroneous-/petulant-archer
Adding a second file, called it test2.txt.