Add make_merge_conflict.py to scripts/ folder
Merge branch 'master' of github.com:tarmstrong/nbdiff