added private settings file to .gitignore
merging