on tick

Conflicts:
	javascript/initSprite.js