initial commit
Resolving conflicts in .gitignore