Initial commit
Resolving README.md conflicts