調整
Merge branch 'master' of github.com:atijust/dotfiles

Conflicts:
	.bashrc