Update .bashrc
Merge remote-tracking branch 'origin/master' into nodex

Conflicts:
	.bashrc