Initial commit with ammend on README
Fixed conflict in README.md