scroll jump update
Merge branch 'master' of https://github.com/RIKU0211/simple_action_game

Conflicts:
	js/test.js
12/10 update