Merged Marwa's Website with Boris and My Stuff
Merge remote-tracking branch 'upstream/master' into Webapp-version-merge
Moved Files
Fix 404 error and added code to generate merge
Merge remote-tracking branch 'upstream/master' into Webapp-version-merge
removed a few whitespacing that travis was indicating
Fixed loading issues with notebook & cleaned temp
Fixed Form for merge using URL

Can generate merge and display it using url form.
Added Command Pattern and code to diff
Merge remote-tracking branch 'upstream/master' into Webapp-version-merge
Added code to make image link to index for remote.
Fixes delay in buttons appearing (flashing) for diff and merge
CSS for fixing delay in buttons appearing
Merge pull request #166 from selenaaa/mult_nbs

Fixes delay in buttons appearing for both diff and merge
Add docstrings to a few functions.
Refactor merge.py, notebook_diff.py, diff.py; add docstrings.
Refactor notebook_diff.py tests into a separate file.
Add test for diff_modified_items()
added some more tests
Fix import of diff() in notebook_diff.py