Added two more aliases for git.
Merge branch 'master' into bachelorproject