testing for merge
Merge branch 'sprites'

Conflicts:
	game-node.js