added config files to gitignore
merge