Change .gitignore
Merge remote-tracking branch 'origin/master' into origin
Configure