Merge remote-tracking branch 'upstream/master'
User Interface Specification Document
UI specification document
Merge branch 'master' of https://github.com/tarmstrong/nbdiff into UIDoc
Added a folder with the website stuff.. will add more to it soon
Merge pull request #71 from MandMk/website

Adding nbdiff.org website layout
Remove files intended for nbdiff-docs repository.
Implement local nbdiff server
Style fixes for flake8.
Merge pull request #73 from selenaaa/flaskstuff

Implement local nbdiff server
Changes made to the merge_script.js for the cell diffin ui
Fixed the errors that were in the code
Local server for diff UI
Small fix
I hope it's all ok now
Some small changes to notebook_diff.py
Style fix for flake8
Merge pull request #91 from selenaaa/diffing

Local server for diff UI
Revert "I hope it's all ok now"

This reverts commit 02876a440f0e3604c2acd86afbfbf8cd216ac113.
Merge branch 'master' of https://github.com/tarmstrong/nbdiff into cell-diff-ui-js