First commit
Resolved conflict in .gitignore