adding gitignore
merging