modified
Merge branch 'master' of github.com:tachiba/dotfiles

Conflicts:
	zshrc