test_message
テスト用での作成(車田)
test2
test IN kurumada
uerge branch 'master' of github.com:m-negishi/RubyCampTeam1
kurumada
Conflicts:
	test.txt
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1
kurumada
Conflicts:
	test.txt
kurumada
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1
kuwatani
Conflicts:
	test.txt
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1
kuwatani
Conflicts:
	test.txt
kurumada Branch
branch test
new branch test
Merge branch 'imo'
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1

Conflicts:
	test.txt
Merge branch 'kurumada'
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1
Merge branch 'kuwatani'
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1
Merge branch 'yanagida'
pull and push test yanagida
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1

Conflicts:
	test.txt