Initial commit
Updated README.md
Fixed merge conflicts