テーマなど
Merge branch 'master' of https://github.com/minodisk/prezto

Conflicts:
	runcoms/zpreztorc
	runcoms/zshrc