fixed gitignore file
merge