git alias
Merge branch 'master' of https://github.com/johndgiese/config

Conflicts:
	.bashrc