Initial commit
Resolve merge conflict in README.md