Git aliases
Merge branch 'master' of github.com:mattack108/dotfiles

Conflicts:
	.aliases