fixes
shuffle
Merge branch 'factor_out_sdl' of http://37.46.80.80/grem_lemon/ into factor_out_sdl

Conflicts:
	main_sdl.py