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

Conflicts:
	.bash_profile