specify range of user
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1
developed water
update_water
can use water
map scroll
add user scroll
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1
add img & vectorimg
update user scroll
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1
add images
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1
add clea onion img
scroll
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1
change img file name
solved conflict
Merge branch 'master' into negi

Conflicts:
	lib/game.rb
	lib/user.rb