c
Merge branch 'develop' of github.com:takehiro224/GitTest into develop

Conflicts:
	hoge.html