Fixed global naming error
Merge branch 'master' of https://github.com/keenanjohnson/cpe4160