Updated README
Updated.
resolved conflict