updated bashrc
Merge branch 'master' of github.com:jayrajput/config

Conflicts:
	bashrc