updating README to reflect last merge