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