a couple more git aliases
Merge branch 'master' into cars