gitconfigの一部をincludeにした
Merge branch 'feature/gitconfig_include'

Conflicts:
	.gitconfig
Merge remote-tracking branch 'hosokawa/master'

Conflicts:
	.gitconfig