commit htmlDiff to allow word diff mode
Merge branch 'working' into gh-pages