Adding editor generated files to gitignore
Merging from origin