Umm, not sure
Merge branch 'master' of https://github.com/NeilCFord/dotfiles.mba

Conflicts:
	.bashrc