added some diff tests
some line diff tests
fixed diff tests
fixed line based diff & added some tests
Merge branch 'master' of https://github.com/tarmstrong/nbdiff into newlinediff
added some tests
test_diff_lines2 is failing :(
moved diff_modified_items to notebook_diff
Fix all line based tests and all work

Conflicts:
	tests/test_diff.py
added some diff tests

Conflicts:
	tests/test_diff.py
some line diff tests

Conflicts:
	tests/test_diff.py
Merge branch 'newlinediff' into merging-newlinediff

Conflicts:
	nbdiff/diff.py
	tests/test_diff.py