initial commit
fixed merge conflict for .gitignore