Initial commit
Improving README
Fixing README conflict