modified dot-gitignore
modified dot-gitignore
Merge remote-tracking branch 'origin/master' into developping