.gitignore and .gitattributes
Merge remote-tracking branch 'origin/development'
Correcting a grammar issue
Grammar fix
Merge branch 'master' into development