Changed signature of `merge`, updated readme

Merge now just merges two diffs. Merging multiple diffs can be
implemented by the caller of the diff.
0.0.2