競合テスト
Merge branch 'master' of https://github.com/corosuke197/himajin_github

Conflicts:
	readme.txt