test_message
test2
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