リポジトリをreposフォルダに移動
Merge branch 'master' of github.com:bundai223/dotfiles

Conflicts:
	util/setup_osx.sh