gitignore
merging gitignore
two types of filters