prompt
Merge branch 'master' of github.com:kenichirow/dotfiles

Conflicts:
	.zshrc
alias git today