add .bashrc
Merge branch 'master' of github.com:jingheelu/scripts

Conflicts:
	.bashrc