bug with sprites
Merge remote-tracking branch 'origin/master'

Conflicts:
	program/sprite_test.py