Initial commit
Initial project setup
Create README.md
commit to master branch
resolving conflicts