Initial commit
Fix conflicts in README.md