updating 'git s' to 'git status -sb'
Merge branch 'master' into laptop