Initial local commit
Fixed README.md conflicts