initial commit
resolves merge conflict in .gitignore