ignore .settings/ doc/ commands
Merge remote-tracking branch 'origin/master'