コリジョンテスト
Merge branch 'master' of https://github.com/Masahiro1118/CreateInquiry_php

Conflicts:
	test.txt