this is a dir commit
Merge branch 'master' of https://github.com/Ayaaa/training_git

Conflicts:
	hoge.txt