my changes?
Merge remote-tracking branch 'origin/master'

Conflicts:
	javascript/initSprite.js