Update
Merge branch 'master' of github.com:Kuniwak/dotfiles
Merge branch 'master' of github.com:Kuniwak/dotfiles

Conflicts:
	.gitconfig