Initial commit
Initial commit
Update README.md
Update README.md
Update .gitignore
Fix merge conflicts