commit .bashrc
Merge branch 'master' of github.com:jtsun1018/carolinesun-repository

Conflicts:
	.bashrc
commit .bashrc .vimrc 14/04/30