e
Merge branch 'master' of https://github.com/Getshi/SPG

Conflicts:
	clr.gmx/GFX/sprFloor.png
	clr.gmx/sprites/images/spr_floor_0.png
font, gui, etc