added more files to gitignore
merge