Starting point
Adding .gitignore
Fixing merge conflicts