teststuff

assorted files
Merge remote-tracking branch 'origin/master'

Conflicts:
	gametest2/bg.jpg
	gametest2/char.png