p-hughes/Dirty_business — pull request #2 by sebastian-c (2012-07-24 06:07:11+00:00)
Title: Updated readme and manually resolved conflict in 'Munsell to cieLAB (main).R'

Just the addition of a flattering new `README.md` and resolved all that business with <<<<<<< in one of the R files.