Updated bashrc
Merge branch 'master' of https://github.com/tliu-work/work_git

Conflicts:
	config/rc_files/.bashrc
Merge branch 'master' of https://github.com/tliu-work/work_git