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
imo
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
collected test files
Merge branch 'negi'
Deleted Sample Files
Merge branch 'negi'
Initial Commit
Start to develop game!