Initial commit
Improve the README
Fixed conflict in README