Diff-n-merge using purely diffs complete. Next step, blackscholes and twitter app.