first commit
fixed merge conflict in gitignore