initial commit
fixes conflict in .gitignore