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.
Merge pull request #28 from detonation0/JP-x2

Added a test string.
Changed string on line 230 for testing.