ドキュメントを追加
Hey!
pen
three
four
Merge branch 'master' of https://github.com/tkgdsg/gitbootcamp

Conflicts:
	readme.txt
commit in branch1
action in master
action2
Merge branch 'topic/branch1'

Conflicts:
	readme.txt
action in branch2
branch3
Merge branch 'topic/branch3' into debug/debug1