First commit
Resolving conflicts in .gitignore