Committed my .bashrc this time
Merge branch 'master' of github.com:yankcrime/dotfiles

Conflicts:
	.bashrc
Right .bashrc this time...