practicing git conflicts
Merge branch 'master' of https://github.com/nczempin/fluxagama

Conflicts:
	src/fluxagama/FluxaSprite.py