Initial commit
Fixed conflict in README.md