conflict
Merge remote-tracking branch 'GitTest/develop' into develop

Conflicts:
	hoge.html