Merge branch 'master' of https://github.com/AaronPerl/SDLProgram.git