Merge remote-tracking branch 'upstream/master'
moved and renamed check_modified method to comparable.py and
added check modified parameter to diff function
added method to compare lines of modified cells
small fixes
Create line comparator and added tavish's tests
Merge branch 'master' of github.com:bsplay/nbdiff
Rename merge_script.js to nbdiff.js.
Rename save_merging_to_ipynb() function to nbmerge_save()
Move javascript init to bottom of file.
Merge remote-tracking branch 'upstream/master'
git adapter first commit
Small fixes
Merge branch 'master' into refactor-js
Merge branch 'master' into refactor-js
Added some code so that the browser opens automatically when nbmerge is called
Server shutdown callback
Refactored merge js
Function to set attribute
Finish refactoring nbdiff.js
Add merge button click handlers