Initial commit
Improve the README
Merge conflict