Initial commit
Fixed README.md conflict