Merge pull request #3 from JJKB599/master

Jeff's changes from Apr. 8
Updated GameWindow.cpp with Jeff's and my changes
Merge pull request #6 from BrennanJones/master

Updated GameWindow.cpp with Jeff's and my changes