Updating the readme.
conflicts resolved