Change text to black on green background. Update test/conflicter.js accordingly.
Merge pull request #399 from imjared/master

Use a text color of black to make diff readable