initial commit
merge conflict resolution in .gitignore