Updating README
Solving merge conflicts and Updating README