gitignore updates
Merge remote-tracking branch 'origin/gitignore'
Merge remote-tracking branch 'origin/master' into 99-Problems