Attempt to fix commit errors.
Merge branch 'master' of github.com:SpaceTeam/GameLib