Initial commit
Update README.md
initial commit
fixed conficts