Test to commit from eric
Merge branch 'master' of https://github.com/specialk1337/Comp371_Graphics