Updating README
Adding a little of love to the README file
Fixing merge conflicts