Fix missed merge conflicts
Merge branch 'graphicsTest' of https://github.com/xysmas/lamegame.git
into graphicsTest