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.
Revert "Added code to make image link to index for remote."

This reverts commit e80f1939a6b7674ca06343fb6b327872d26ec820.
Merge remote-tracking branch 'upstream/master' into Webapp-version-merge

Conflicts:
	nbdiff/notebook_parser.py
Moved static files, added new pages, workinprogress save
Added Save Feature

Only issue involves js alerts prior to downloading.
Fixed bug with alerts when save is clicked

Added form submission to open new tab.
Fixed Flake8 python indent errors
Merge branch 'master' into Webapp-version-merge
Fix javascript style issues
Remove Thumbs.db ugh