Stop scroll when map scrolled by bottom
Merge branch 'master' into negi
Change user scroll speed
solved conflict
Merge branch 'master' into negi

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