changes on gitignore file
merge