initial commit
fixing merge conflict in .gitignore