Updated header file guards for game files
Merge remote-tracking branch 'origin/master'