Merge branch 'master' of https://github.com/tarmstrong/nbdiff into newlinediff
Merge branch 'master' of https://github.com/tarmstrong/nbdiff into newlinediff
Merge branch 'master' of https://github.com/tarmstrong/nbdiff into newlinediff
Fix all line based tests and all work
put the fixed flake8 in linenewdiff branch