First Commit
Fixed conflicts in README.md