3
conclude merge
add gitignore
4
Merge branch 'master' into develop

Conflicts:
	hoge.txt