new branch test
Merge branch 'yanagida'
pull and push test yanagida
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1

Conflicts:
	test.txt