Update .bashrc
Merge branch 'master' of github.com:kianby/dotfiles

Conflicts:
	.bashrc