Merge pull request #30 from zimmski/pretty-text

Colored text diff