Modify git config
Merge branch 'master' of github.com:hikutsu/dotfiles

Conflicts:
	.zshrc