updating more entires in .gitignore
merging