Update by KJ
Merge branch 'master' of github.com:fujikky/dotfiles

Conflicts:
	.bash_profile
	.bashrc