Merge Test 2
Merge pull request #30 from alex-stone/alex/merge_test2

Testing if Merging a PR that contains a commit "Merge Test 2" that also exists in PR #31, but #31 also has other commits