aa
ignorefile
Merge branch 'master' of
https://github.com/Ohata1016/PracticeRepository.git

Conflicts:
	hoge.txt
aaaa
aaaaa
Merge remote-tracking branch 'origin/ohata'
Marge TEst