make it so - initial commit
Update README.md
small conflixt resolved