added gitignore
Merge