Merge branch 'master' of https://github.com/tarmstrong/nbdiff into newlinediff
Merge branch 'master' of https://github.com/tarmstrong/nbdiff into newlinediff
Add test for lcs() with no cells that are equal
Fixes #128 - diff when no items are equal
Slight modification to test_lcs_noequals()
crash fix
Merge pull request #129 from tarmstrong/diff-noequals

Fix for #128 - lcs() breaks when no cells are equal
Merge branch 'no_unmerged_notebook_fix' of github.com:bsplay/nbdiff into bsplay-no_unmerged_notebook_fix
Merge branch 'master' of https://github.com/tarmstrong/nbdiff into newlinediff
Fix all line based tests and all work
Merge pull request #127 from Shurouq/newlinediff

Implement line-based diffing UI and back-end.
Remove nbdiff-install script.
Remove json checks from travis build.
Merge pull request #134 from tarmstrong/remove-nbdiff-install

Remove nbdiff-install script.
Merge pull request #135 from tarmstrong/remove-json-checks-travis

Remove json checks from travis build.
Remove notes/ folder. This stuff is in nbdiff-docs.
Remove prototype. This stuff is in the main program now.
Removing docs/ folder. This is in nbdiff-docs
Add install_requires to setup.py.

So people don't have to run pip install -r requirements any more.
Merge pull request #136 from tarmstrong/add-install-requires

Add install_requires to setup.py.