added gitignore
added gitignore 2
merge conflict