start to develop water
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1
user update
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1 into kuwatani
water_test
Merge branch 'kuwa'
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
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1
water_test
stage data
tamanegi
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1