added gitignore
merge