Added a test string for merge conflict testing.
Fixing syntax error
Merge pull request #27 from aesanch2/JP-x1

Added a test string for merge conflict testing.