コンフリクトテスト
Merge branch 'master' of https://github.com/teddy-go/configs

Conflicts:
	README.md