Git: push.default = simple
Add ackrc
Merge branch 'master' into work-mac