Merge branch 'master' of github.com:m-negishi/RubyCampTeam1
user update
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1

Conflicts:
	main.rb
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1

Conflicts:
	lib/game.rb