Save notebook for merge. (not working)
Flake8 style fix
Fix. Added save_notebook() to commands.py
Rename merge_script.js to nbdiff.js.
Rename save_merging_to_ipynb() function to nbmerge_save()
Move javascript init to bottom of file.
Add make_merge_conflict.py to scripts/ folder
Merge branch 'master' of github.com:tarmstrong/nbdiff
Make make_diff.py file
Add readme explaining scripts/ folder.
Implemented save notebook to disk.
Flake8 style fix
Deleted commented code
Merge branch 'master' into refactor-js
Merge pull request #99 from selenaaa/savenb

nbmerge: save notebook to disk after successful merge
Merge branch 'master' into refactor-js
Removed print statements
Merge pull request #108 from selenaaa/savenb

Removed print statements
Added some code so that the browser opens automatically when nbmerge is called
Server shutdown callback