initial commit
fixed merge conflict in .gitignore