Testing how branches work

I didn't actually change anything to the file
Merge pull request #1 from Artchibald/sub-branch-to-test-how-branches-wo

Testing how branches work