Initial commit
Improve the README
Resolved README conflict