Updating git ignore
Updating gitignore
Merge branch 'master' into working