Initial commit
Improve the readme
fix conflict