add hoge.txdt
add line
Merge pull request #2 from horiken4/topic2

Topic2
Merge pull request #1 from horiken4/topic1

Topic1
add fuga4
add fugafuga
add fuga5
Merge branch 'master' of https://github.com/horiken4/test

Conflicts:
	fuga.txt
add hoge3
Merge branch 'master' of https://github.com/horiken4/test into topic2

Conflicts:
	fuga.txt