Initial commit
Update README.md
init
Fix conflict