Added git d = git diff.
Merge branch 'master' into server