Call addButtonListeners only on merge
Merge pull request #151 from tarmstrong/fix-addbuttonlisteners

Call addButtonListeners only on merge
Fix #152 - Start server for nbmerge when arguments given.
Merge pull request #153 from tarmstrong/start-server-for-arguments

Fix #152 - Start server for nbmerge when arguments are given.
Modified commands.py to handle multiple notebooks
Fixed loops
Flake8 fixes
Fix merge conflict.
Load multiple notebooks
Flake8 fixes
Added markdown for the header diffs
Fixed some stuff
Fixed some stuff
Revert "Fixed some stuff"

This reverts commit 8491e3a7101a14303fce9de4a80a6b2fa90d1d23.
Implemented word-based diffs of headers
Fix bug, modifiedness scoring
Fix flake issue and broken js test.
Merge pull request #159 from MandMk/diffed-header

Added javascript for the header diffs
Merge Lina and Shurouq tests
Merge pull request #138 from LinaNouh/newlinediff

added some diff tests