テスト
2nd commit
3rd commit
4th commit
5th commit
6th commit
Merge branch 'feature/firstbranch' into develop
commit 2-1
commit 2-2
commit 3-1
commit 3-2
commit 4-1
commit 2-3
Merge branch 'feature/secondbranch' into develop
Merge branch 'feature/fourthbranch' into develop

Conflicts:
	kakiku.txt
Merge branch 'develop' of https://github.com/toyohikomotoyama/gitflowpractice into develop
commit2
pppp
no message
1