add some logic to ball.update()
Merge remote-tracking branch 'origin/master'

Conflicts:
	scripts/ball.js
Revert "add some logic to ball.update()"

This reverts commit 5c1cb7b14974951a49d72d002042cd5f13231e10.