Line added to demonstrate commit.

A line was added to the testFile.txt to show Greg how the commit message works.
Merge branch 'test-branch'