updated .bashrc.
Merge branch 'master' of github.com:shridharsheth/config-files

Conflicts:
	.bashrc