init app
Create README.md
Fix merge conflict