try to fix the pull
Merge branch 'master' of https://github.com/tarmstrong/nbdiff into prototype

Conflicts:
	prototype/old-merge.html
diff final version
new merge prototype version
Merge pull request #42 from Shurouq/prototype-new-version

Prototype new version
Add Python tests to travis-ci build
Remove empty test file from tests/
Fix travis-ci build: s/git2json/nbdiff/
Blank lines in commands.py
Merge pull request #43 from tarmstrong/add-python-to-travis-ci-build

Add python to travis ci build
mockup with the original file ..
Merge branch 'merge-with-original' of https://github.com/Shurouq/nbdiff into Shurouq-merge-with-original
merge with final result
playing with loading a notebook
working load_notebook
to make flake happy
forgot to remove unused import
Merge pull request #46 from Shurouq/merge-with-original

Some fixes for the prototype
Merge pull request #47 from Shurouq/merge

Remove apparent line breaks in last cell of merge prototype
Some fixed for the prototype