Bug #7
Merge branch 'master' of https://github.com/Westmont-CS130/webwork2