Edit hoge.txt
Merge branch 'master' of https://github.com/autohn/GitExercise
aaaaaaaaaaaaaaaaaaa
Merge remote-tracking branch 'origin/master'

Conflicts:
	kaido.txt