Starting the README
Fixing merge conflict