added filler bg / changed some 'stuff'
Sprite Flipping
Merge remote-tracking branch 'origin/master'

Conflicts:
	test.cpp