No real changes, just trying to get Git to stop complaining about local changes being overwritten
Merge branch 'master' of github.com:e23walls/splat
Added a display to the emulator using the CImg GL