patchforge

Update Readme

Refactor and add command line arguments

More matching options, logging hunks with ids

Handle simple merge conflicts produced by code movement

Simple patching ignoring conflicts