gitignore  edit -1
Merge remote-tracking branch 'origin/development' into development