start to develop water
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
water_test