Prompt and term title
gitignore
Merge branch 'master' into osx + local .gitignore